Moving IME manifests to chrome resources.

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 45 matching lines @@
 
 namespace chromeos {
 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() {
-  input_method::InputMethodManager::Get()->GetComponentExtensionIMEManager()->
-      RemoveObserver(this);
 }
 
 void CrosLanguageOptionsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   ::options::LanguageOptionsHandlerCommon::GetLocalizedValues(
       localized_strings);
 
   RegisterTitle(localized_strings, "languagePage",
                 IDS_OPTIONS_SETTINGS_LANGUAGES_AND_INPUT_DIALOG_TITLE);
   localized_strings->SetString("okButton", l10n_util::GetStringUTF16(IDS_OK));
@@ skipping 38 matching lines @@
   manager->GetInputMethodExtensions(&ext_ime_descriptors);
 
   base::ListValue* ext_ime_list = ConvertInputMethodDescriptorsToIMEList(
       ext_ime_descriptors);
   AddImeProvider(ext_ime_list);
   localized_strings->Set("extensionImeList", ext_ime_list);
 
   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()));
+  composition_extension_appended_ = true;
 }
 
 void CrosLanguageOptionsHandler::RegisterMessages() {
   ::options::LanguageOptionsHandlerCommon::RegisterMessages();
 
   web_ui()->RegisterMessageCallback("inputMethodDisable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodDisableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodEnable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodEnableCallback,
@@ skipping 349 matching lines @@
       SINGLETON_TAB,
       content::PAGE_TRANSITION_LINK,
       false);
   browser->OpenURL(params);
   browser->window()->Show();
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   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_)

[Alexander Alekseev, 2014/07/14 14:07:29]

It seems that IME is now accessed in GetLocalizedValues(), so
composition_extension_appended_ should be always true here.

It seems that "composition_extension_appended_" can also be dropped here. (And
JS "options.LanguageOptions.onComponentManagerInitialized").

[Shu Chen, 2014/07/14 15:07:21]

Done.

     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;
 }
 
@@ skipping 12 matching lines @@
         extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
     const extensions::Extension* extension =
         enabled_extensions.GetByID(extension_id);
     if (extension)
       entry->SetString("extensionName", extension->name());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos