[IME] InputMethodUtil should cache the hardware layouts from VPD, instead of the filtered hardware …

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 73 matching lines @@
       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_);
   SetupTimeouts();
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
-  manager->SetInputMethodLoginDefault();
   manager->GetComponentExtensionIMEManager()->AddObserver(this);
 }
 
 NetworkScreenHandler::~NetworkScreenHandler() {
   if (screen_)
     screen_->OnActorDestroyed(this);
 
   input_method::InputMethodManager::Get()
       ->GetComponentExtensionIMEManager()
       ->RemoveObserver(this);
@@ skipping 324 matching lines @@
       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() {
-  input_method::InputMethodManager::Get()->SetInputMethodLoginDefault();
-
   // 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::ReloadLocalizedContent() {
   base::DictionaryValue localized_strings;
@@ skipping 16 matching lines @@
         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();
-  const std::vector<std::string>& hardware_login_input_methods =
-      util->GetHardwareLoginInputMethodIds();
   std::set<std::string> input_methods_added;
 
   for (std::vector<std::string>::const_iterator i =
            hardware_login_input_methods.begin();
        i != hardware_login_input_methods.end();
        ++i) {
     const input_method::InputMethodDescriptor* ime =
         util->GetInputMethodDescriptorFromId(*i);
     DCHECK(ime != NULL);
     // Do not crash in case of misconfiguration.
@@ skipping 56 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