Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7156)

Unified Diff: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

Issue 389913002: Moving IME manifests to chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
index 3c31fccf733cf60ed4d0e8b06112999b837e375c..62708888e20636a824aa82139fad8ff9c2a53a7d 100644
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
@@ -60,16 +60,10 @@ namespace options {
const char kVendorOtherLanguagesListDivider[] =
"VENDOR_OTHER_LANGUAGES_LIST_DIVIDER";
-CrosLanguageOptionsHandler::CrosLanguageOptionsHandler()
- : composition_extension_appended_(false),
- is_page_initialized_(false) {
- input_method::InputMethodManager::Get()->GetComponentExtensionIMEManager()->
- AddObserver(this);
+CrosLanguageOptionsHandler::CrosLanguageOptionsHandler() {
}
CrosLanguageOptionsHandler::~CrosLanguageOptionsHandler() {
- input_method::InputMethodManager::Get()->GetComponentExtensionIMEManager()->
- RemoveObserver(this);
}
void CrosLanguageOptionsHandler::GetLocalizedValues(
@@ -128,18 +122,10 @@ void CrosLanguageOptionsHandler::GetLocalizedValues(
ComponentExtensionIMEManager* component_extension_manager =
input_method::InputMethodManager::Get()
->GetComponentExtensionIMEManager();
- if (component_extension_manager->IsInitialized()) {
- localized_strings->Set(
- "componentExtensionImeList",
- ConvertInputMethodDescriptorsToIMEList(
- component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
- composition_extension_appended_ = true;
- } else {
- // If component extension IME manager is not ready for use, it will be
- // added in |InitializePage()|.
- localized_strings->Set("componentExtensionImeList",
- new base::ListValue());
- }
+ localized_strings->Set(
+ "componentExtensionImeList",
+ ConvertInputMethodDescriptorsToIMEList(
+ component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
}
void CrosLanguageOptionsHandler::RegisterMessages() {
@@ -509,50 +495,6 @@ void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(
web_contents->GetDelegate()->ActivateContents(web_contents);
}
-void CrosLanguageOptionsHandler::OnImeComponentExtensionInitialized() {
- if (composition_extension_appended_ || !is_page_initialized_) {
- // If an option page is not ready to call JavaScript, appending component
- // extension IMEs will be done in InitializePage function later.
- return;
- }
-
- ComponentExtensionIMEManager* manager =
- input_method::InputMethodManager::Get()
- ->GetComponentExtensionIMEManager();
-
- DCHECK(manager->IsInitialized());
- scoped_ptr<base::ListValue> ime_list(
- ConvertInputMethodDescriptorsToIMEList(
- manager->GetAllIMEAsInputMethodDescriptor()));
- web_ui()->CallJavascriptFunction(
- "options.LanguageOptions.onComponentManagerInitialized",
- *ime_list);
- composition_extension_appended_ = true;
-}
-
-void CrosLanguageOptionsHandler::InitializePage() {
- is_page_initialized_ = true;
- if (composition_extension_appended_)
- return;
-
- ComponentExtensionIMEManager* component_extension_manager =
- input_method::InputMethodManager::Get()
- ->GetComponentExtensionIMEManager();
- if (!component_extension_manager->IsInitialized()) {
- // If the component extension IME manager is not available yet, append the
- // component extension list in |OnInitialized()|.
- return;
- }
-
- scoped_ptr<base::ListValue> ime_list(
- ConvertInputMethodDescriptorsToIMEList(
- component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
- web_ui()->CallJavascriptFunction(
- "options.LanguageOptions.onComponentManagerInitialized",
- *ime_list);
- composition_extension_appended_ = true;
-}
-
void CrosLanguageOptionsHandler::AddImeProvider(base::ListValue* list) {
Profile* profile = Profile::FromWebUI(web_ui());
const extensions::ExtensionSet& enabled_extensions =

Powered by Google App Engine
This is Rietveld 408576698