Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h |
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h |
index 33f86871df23e8145ab5339695ae2762119ea4c8..1d88392714e3e0704569e264d2678f4f1de0b0c1 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h |
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h |
@@ -5,7 +5,10 @@ |
#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_ |
#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_ |
+#include <string> |
+ |
#include "base/compiler_specific.h" |
+#include "base/macros.h" |
#include "chrome/browser/ui/webui/options/language_options_handler.h" |
#include "chromeos/ime/component_extension_ime_manager.h" |
#include "chromeos/ime/input_method_descriptor.h" |
@@ -13,11 +16,6 @@ |
namespace chromeos { |
namespace options { |
-// GetUILanguageList() returns concatenated list of list of vendor languages |
-// followed by other languages. An entry with "code" attribute set to this value |
-// is inserted in between. |
-extern const char kVendorOtherLanguagesListDivider[]; |
- |
// Language options page UI handler for Chrome OS. For non-Chrome OS, |
// see LanguageOptionsHnadler. |
class CrosLanguageOptionsHandler |
@@ -36,36 +34,14 @@ class CrosLanguageOptionsHandler |
// The following static methods are public for ease of testing. |
- // Gets the list of input methods from the given input descriptors. |
+ // Gets the list of supported input methods. |
// The return value will look like: |
// [{'id': 'pinyin', 'displayName': 'Pinyin', |
// 'languageCodeSet': {'zh-CW': true}}, ...] |
// |
// Note that true in languageCodeSet does not mean anything. We just use |
// the dictionary as a set. |
- static base::ListValue* GetInputMethodList( |
- const input_method::InputMethodDescriptors& descriptors); |
- |
- // Gets the list of accept languages with the given input descriptors. |
- // Listed languages will be used as Accept-Language header. |
- // The return value will look like: |
- // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'}, |
- // ...] |
- // "most relevant" languages, as set in initial_locale in VPD, will be first |
- // in the list. |
- static base::ListValue* GetAcceptLanguageList( |
- const input_method::InputMethodDescriptors& descriptors); |
- |
- // Gets the list of UI languages with the given input descriptors. |
- // The return value will look like: |
- // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'}, |
- // ...] |
- // "most relevant" languages, as set in initial_locale in VPD, will be first |
- // in the list. |
- // An entry with "code" attribute set to kVendorOtherLanguagesListDivider is |
- // used as a divider to separate "most relevant" languages against other. |
- static base::ListValue* GetUILanguageList( |
- const input_method::InputMethodDescriptors& descriptors); |
+ static base::ListValue* GetInputMethodList(); |
// Converts input method descriptors to the list of input methods. |
// The return value will look like: |
@@ -97,16 +73,6 @@ class CrosLanguageOptionsHandler |
// ComponentExtensionIMEManager::Observer override. |
virtual void OnImeComponentExtensionInitialized() OVERRIDE; |
- // Gets the list of languages with |descriptors| based on |
- // |base_language_codes|. |
- // |insert_divider| means to insert entry with "code" attribute set to |
- // kVendorOtherLanguagesListDivider between "most relevant" languages and |
- // other. |
- static base::ListValue* GetLanguageListInternal( |
- const input_method::InputMethodDescriptors& descriptors, |
- const std::vector<std::string>& base_language_codes, |
- bool insert_divider); |
- |
// OptionsPageUIHandler implementation. |
virtual void InitializePage() OVERRIDE; |