Moving IME manifests to chrome resources.

chrome/browser/ui/webui/chromeos/login/network_screen_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/chromeos/login/network_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 76 matching lines @@
 namespace chromeos {
 
 // NetworkScreenHandler, public: -----------------------------------------------
 
 NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
     : BaseScreenHandler(kJsScreenPath),
       screen_(NULL),
       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() {
   if (screen_)
     screen_->OnActorDestroyed(this);
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   manager->RemoveObserver(this);
-  manager->GetComponentExtensionIMEManager()->RemoveObserver(this);
 }
 
 // NetworkScreenHandler, NetworkScreenActor implementation: --------------------
 
 void NetworkScreenHandler::SetDelegate(NetworkScreenActor::Delegate* screen) {
   screen_ = screen;
 }
 
 void NetworkScreenHandler::PrepareToShow() {
 }
@@ skipping 91 matching lines @@
   dict->Set("timezoneList", GetTimezoneList());
 }
 
 void NetworkScreenHandler::Initialize() {
   EnableContinue(is_continue_enabled_);
   if (show_on_init_) {
     show_on_init_ = false;
     Show();
   }
 
-  if (should_reinitialize_language_keyboard_list_) {
-    should_reinitialize_language_keyboard_list_ = false;
-    ReloadLocalizedContent();
-  }
-
   timezone_subscription_ = CrosSettings::Get()->AddSettingsObserver(
       kSystemTimezone,
       base::Bind(&NetworkScreenHandler::OnSystemTimezoneChanged,
                  base::Unretained(this)));
   OnSystemTimezoneChanged();
 }
 
 // NetworkScreenHandler, WebUIMessageHandler implementation: -------------------
 
 void NetworkScreenHandler::RegisterMessages() {
@@ skipping 98 matching lines @@
   CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
   CallJS("setTimezone", current_timezone_id);
 }
 
 base::ListValue* NetworkScreenHandler::GetLanguageList() {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   input_method::InputMethodManager* manager =
       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) {
     base::DictionaryValue* language_info = NULL;
     if (!languages_list->GetDictionary(i, &language_info))
       NOTREACHED();
 
     std::string value;
     language_info->GetString("code", &value);
     std::string display_name;
@@ skipping 32 matching lines @@
   input_method::InputMethodUtil* util =
       input_method::InputMethodManager::Get()->GetInputMethodUtil();
   const std::string& ime_id = method.id();
   scoped_ptr<base::DictionaryValue> input_method(new base::DictionaryValue);
   input_method->SetString("value", ime_id);
   input_method->SetString("title", util->GetInputMethodLongName(method));
   input_method->SetBoolean("selected", ime_id == current_input_method_id);
   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());
 }
 
 void NetworkScreenHandler::ReloadLocalizedContent() {
   base::DictionaryValue localized_strings;
   static_cast<OobeUI*>(web_ui()->GetController())
       ->GetLocalizedStrings(&localized_strings);
   core_oobe_actor_->ReloadContent(localized_strings);
 
   // Buttons are recreated, updated "Continue" button state.
   EnableContinue(is_continue_enabled_);
 }
 
 // static
 base::ListValue* NetworkScreenHandler::GetInputMethods() {
   base::ListValue* input_methods_list = new base::ListValue;
   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();
   manager->EnableLoginLayouts(g_browser_process->GetApplicationLocale(),
                               hardware_login_input_methods);
 
   scoped_ptr<input_method::InputMethodDescriptors> input_methods(
       manager->GetActiveInputMethods());
   const std::string current_input_method_id =
       manager->GetCurrentInputMethod().id();
@@ skipping 66 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos