WebUI: Remove _options_ from language_*_options_handler.[cc,h].
BUG=78498
TEST=None
[email protected]
Review URL: http://codereview.chromium.org/6865043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82105 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc
similarity index 94%
rename from chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.cc
rename to chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc
index a133235..1552f4f 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
#include <limits>
@@ -21,13 +21,13 @@
namespace chromeos {
-LanguageChewingOptionsHandler::LanguageChewingOptionsHandler() {
+LanguageChewingHandler::LanguageChewingHandler() {
}
-LanguageChewingOptionsHandler::~LanguageChewingOptionsHandler() {
+LanguageChewingHandler::~LanguageChewingHandler() {
}
-void LanguageChewingOptionsHandler::GetLocalizedValues(
+void LanguageChewingHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
diff --git a/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h
similarity index 69%
rename from chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h
rename to chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h
index d8d882b..979a0fa 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_HANDLER_H_
#pragma once
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "chrome/browser/ui/webui/options/options_ui.h"
class DictionaryValue;
@@ -13,18 +15,18 @@
namespace chromeos {
// Chewing options page UI handler.
-class LanguageChewingOptionsHandler : public OptionsPageUIHandler {
+class LanguageChewingHandler : public OptionsPageUIHandler {
public:
- LanguageChewingOptionsHandler();
- virtual ~LanguageChewingOptionsHandler();
+ LanguageChewingHandler();
+ virtual ~LanguageChewingHandler();
// OptionsPageUIHandler implementation.
- virtual void GetLocalizedValues(DictionaryValue* localized_strings);
+ virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
private:
- DISALLOW_COPY_AND_ASSIGN(LanguageChewingOptionsHandler);
+ DISALLOW_COPY_AND_ASSIGN(LanguageChewingHandler);
};
} // namespace chromeos
-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc
similarity index 83%
rename from chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.cc
rename to chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc
index 800e6512..b22eb86 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
@@ -12,13 +12,13 @@
namespace chromeos {
-LanguageHangulOptionsHandler::LanguageHangulOptionsHandler() {
+LanguageHangulHandler::LanguageHangulHandler() {
}
-LanguageHangulOptionsHandler::~LanguageHangulOptionsHandler() {
+LanguageHangulHandler::~LanguageHangulHandler() {
}
-void LanguageHangulOptionsHandler::GetLocalizedValues(
+void LanguageHangulHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
@@ -31,7 +31,7 @@
localized_strings->Set("HangulkeyboardLayoutList", GetKeyboardLayoutList());
}
-ListValue* LanguageHangulOptionsHandler::GetKeyboardLayoutList() {
+ListValue* LanguageHangulHandler::GetKeyboardLayoutList() {
ListValue* keyboard_layout_list = new ListValue();
for (size_t i = 0; i < language_prefs::kNumHangulKeyboardNameIDPairs; ++i) {
ListValue* option = new ListValue();
diff --git a/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h
similarity index 74%
rename from chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h
rename to chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h
index ec0770c..28c7a6c 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_HANDLER_H_
#pragma once
#include "chrome/browser/ui/webui/options/options_ui.h"
@@ -14,10 +14,10 @@
namespace chromeos {
// Hangul options page UI handler.
-class LanguageHangulOptionsHandler : public OptionsPageUIHandler {
+class LanguageHangulHandler : public OptionsPageUIHandler {
public:
- LanguageHangulOptionsHandler();
- virtual ~LanguageHangulOptionsHandler();
+ LanguageHangulHandler();
+ virtual ~LanguageHangulHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
@@ -26,9 +26,9 @@
// Returns the list of hangul keyboards.
static ListValue* GetKeyboardLayoutList();
- DISALLOW_COPY_AND_ASSIGN(LanguageHangulOptionsHandler);
+ DISALLOW_COPY_AND_ASSIGN(LanguageHangulHandler);
};
} // namespace chromeos
-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc
similarity index 92%
rename from chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.cc
rename to chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc
index c9115753..18468d4 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
@@ -18,13 +18,13 @@
namespace chromeos {
-LanguageMozcOptionsHandler::LanguageMozcOptionsHandler() {
+LanguageMozcHandler::LanguageMozcHandler() {
}
-LanguageMozcOptionsHandler::~LanguageMozcOptionsHandler() {
+LanguageMozcHandler::~LanguageMozcHandler() {
}
-void LanguageMozcOptionsHandler::GetLocalizedValues(
+void LanguageMozcHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
diff --git a/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h
new file mode 100644
index 0000000..e1a5419
--- /dev/null
+++ b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_HANDLER_H_
+#pragma once
+
+#include "chrome/browser/ui/webui/options/options_ui.h"
+
+class DictionaryValue;
+
+namespace chromeos {
+
+// Mozc options page UI handler.
+class LanguageMozcHandler : public OptionsPageUIHandler {
+ public:
+ LanguageMozcHandler();
+ virtual ~LanguageMozcHandler();
+
+ // OptionsPageUIHandler implementation.
+ virtual void GetLocalizedValues(DictionaryValue* localized_strings);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(LanguageMozcHandler);
+};
+
+} // namespace chromeos
+
+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h
deleted file mode 100644
index 11e6b13..0000000
--- a/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
-#pragma once
-
-#include "chrome/browser/ui/webui/options/options_ui.h"
-
-class DictionaryValue;
-
-namespace chromeos {
-
-// Mozc options page UI handler.
-class LanguageMozcOptionsHandler : public OptionsPageUIHandler {
- public:
- LanguageMozcOptionsHandler();
- virtual ~LanguageMozcOptionsHandler();
-
- // OptionsPageUIHandler implementation.
- virtual void GetLocalizedValues(DictionaryValue* localized_strings);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LanguageMozcOptionsHandler);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc
similarity index 91%
rename from chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc
rename to chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc
index 1541000..978ab3c 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
#include "base/values.h"
#include "chrome/browser/chromeos/language_preferences.h"
@@ -16,13 +16,13 @@
namespace chromeos {
-LanguagePinyinOptionsHandler::LanguagePinyinOptionsHandler() {
+LanguagePinyinHandler::LanguagePinyinHandler() {
}
-LanguagePinyinOptionsHandler::~LanguagePinyinOptionsHandler() {
+LanguagePinyinHandler::~LanguagePinyinHandler() {
}
-void LanguagePinyinOptionsHandler::GetLocalizedValues(
+void LanguagePinyinHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
diff --git a/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h
similarity index 71%
rename from chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h
rename to chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h
index 58a7b6a..270ef2c2 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_HANDLER_H_
#pragma once
#include "chrome/browser/ui/webui/options/options_ui.h"
@@ -13,18 +13,18 @@
namespace chromeos {
// Pinyin options page UI handler.
-class LanguagePinyinOptionsHandler : public OptionsPageUIHandler {
+class LanguagePinyinHandler : public OptionsPageUIHandler {
public:
- LanguagePinyinOptionsHandler();
- virtual ~LanguagePinyinOptionsHandler();
+ LanguagePinyinHandler();
+ virtual ~LanguagePinyinHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
private:
- DISALLOW_COPY_AND_ASSIGN(LanguagePinyinOptionsHandler);
+ DISALLOW_COPY_AND_ASSIGN(LanguagePinyinHandler);
};
} // namespace chromeos
-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_HANDLER_H_
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index b66400b5e..f42fda36 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -57,11 +57,11 @@
#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h"
@@ -214,15 +214,15 @@
new chromeos::AccountsOptionsHandler());
AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
AddOptionsPageUIHandler(localized_strings,
- new chromeos::LanguageChewingOptionsHandler());
+ new chromeos::LanguageChewingHandler());
AddOptionsPageUIHandler(localized_strings,
new chromeos::LanguageCustomizeModifierKeysHandler());
AddOptionsPageUIHandler(localized_strings,
- new chromeos::LanguageHangulOptionsHandler());
+ new chromeos::LanguageHangulHandler());
AddOptionsPageUIHandler(localized_strings,
- new chromeos::LanguageMozcOptionsHandler());
+ new chromeos::LanguageMozcHandler());
AddOptionsPageUIHandler(localized_strings,
- new chromeos::LanguagePinyinOptionsHandler());
+ new chromeos::LanguagePinyinHandler());
AddOptionsPageUIHandler(localized_strings, new chromeos::ProxyHandler());
AddOptionsPageUIHandler(localized_strings,
new chromeos::ChangePictureOptionsHandler());
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ed644d2..5e16263 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3272,18 +3272,18 @@
'browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h',
'browser/ui/webui/options/chromeos/internet_options_handler.cc',
'browser/ui/webui/options/chromeos/internet_options_handler.h',
- 'browser/ui/webui/options/chromeos/language_chewing_options_handler.cc',
- 'browser/ui/webui/options/chromeos/language_chewing_options_handler.h',
+ 'browser/ui/webui/options/chromeos/language_chewing_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_chewing_handler.h',
'browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.cc',
'browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h',
- 'browser/ui/webui/options/chromeos/language_hangul_options_handler.cc',
- 'browser/ui/webui/options/chromeos/language_hangul_options_handler.h',
- 'browser/ui/webui/options/chromeos/language_mozc_options_handler.cc',
- 'browser/ui/webui/options/chromeos/language_mozc_options_handler.h',
+ 'browser/ui/webui/options/chromeos/language_hangul_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_hangul_handler.h',
+ 'browser/ui/webui/options/chromeos/language_mozc_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_mozc_handler.h',
'browser/ui/webui/options/chromeos/language_options_util.cc',
'browser/ui/webui/options/chromeos/language_options_util.h',
- 'browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc',
- 'browser/ui/webui/options/chromeos/language_pinyin_options_handler.h',
+ 'browser/ui/webui/options/chromeos/language_pinyin_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_pinyin_handler.h',
'browser/ui/webui/options/chromeos/proxy_handler.cc',
'browser/ui/webui/options/chromeos/proxy_handler.h',
'browser/ui/webui/options/chromeos/stats_options_handler.cc',
