Moving IME manifests to chrome resources.

chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index f088321c36f2394cc32099f0f84365c5faceda44..48d008d33432529be5f0101c4aebb1eb8accbefd 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -95,14 +95,12 @@ NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
       core_oobe_actor_(core_oobe_actor),
       is_continue_enabled_(false),
       show_on_init_(false),
-      should_reinitialize_language_keyboard_list_(false),
       weak_ptr_factory_(this) {
   DCHECK(core_oobe_actor_);
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   manager->AddObserver(this);
-  manager->GetComponentExtensionIMEManager()->AddObserver(this);
 }
 
 NetworkScreenHandler::~NetworkScreenHandler() {
@@ -112,7 +110,6 @@ NetworkScreenHandler::~NetworkScreenHandler() {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   manager->RemoveObserver(this);
-  manager->GetComponentExtensionIMEManager()->RemoveObserver(this);
 }
 
 // NetworkScreenHandler, NetworkScreenActor implementation: --------------------
@@ -224,11 +221,6 @@ void NetworkScreenHandler::Initialize() {
     Show();
   }
 
-  if (should_reinitialize_language_keyboard_list_) {
-    should_reinitialize_language_keyboard_list_ = false;
-    ReloadLocalizedContent();
-  }
-
   timezone_subscription_ = CrosSettings::Get()->AddSettingsObserver(
       kSystemTimezone,
       base::Bind(&NetworkScreenHandler::OnSystemTimezoneChanged,
@@ -352,9 +344,8 @@ base::ListValue* NetworkScreenHandler::GetLanguageList() {
       input_method::InputMethodManager::Get();
   ComponentExtensionIMEManager* comp_manager =
       manager->GetComponentExtensionIMEManager();
-  input_method::InputMethodDescriptors descriptors;
-  if (comp_manager->IsInitialized())
-    descriptors = comp_manager->GetXkbIMEAsInputMethodDescriptor();
+  input_method::InputMethodDescriptors descriptors =
+      comp_manager->GetXkbIMEAsInputMethodDescriptor();
   base::ListValue* languages_list =
       options::CrosLanguageOptionsHandler::GetUILanguageList(descriptors);
   for (size_t i = 0; i < languages_list->GetSize(); ++i) {
@@ -407,15 +398,6 @@ base::DictionaryValue* CreateInputMethodsEntry(
   return input_method.release();
 }
 
-void NetworkScreenHandler::OnImeComponentExtensionInitialized() {
-  // Refreshes the language and keyboard list once the component extension
-  // IMEs are initialized.
-  if (page_is_ready())
-    ReloadLocalizedContent();
-  else
-    should_reinitialize_language_keyboard_list_ = true;
-}
-
 void NetworkScreenHandler::InputMethodChanged(
     input_method::InputMethodManager* manager, bool show_message) {
   CallJS("setInputMethod", manager->GetCurrentInputMethod().id());
@@ -437,15 +419,6 @@ base::ListValue* NetworkScreenHandler::GetInputMethods() {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
-  ComponentExtensionIMEManager* comp_manager =
-      manager->GetComponentExtensionIMEManager();
-  if (!comp_manager->IsInitialized()) {
-    input_method::InputMethodDescriptor fallback =
-        util->GetFallbackInputMethodDescriptor();
-    input_methods_list->Append(
-        CreateInputMethodsEntry(fallback, fallback.id()));
-    return input_methods_list;
-  }
 
   const std::vector<std::string>& hardware_login_input_methods =
       util->GetHardwareLoginInputMethodIds();