Guest Mode: input method should default to the underlying latin keyboard layout.

chrome/browser/chromeos/login/login_display_host_impl.cc

Index: chrome/browser/chromeos/login/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
index 9314bf0c93f390320d29807b8703062590715d3e..a145e5b5dee16c8c8a1e01a8a987f2ed933bec50 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -1136,9 +1136,8 @@ void ShowLoginWizard(const std::string& first_screen_name) {
     if (!prefs->HasPrefPath(prefs::kApplicationLocale)) {
       std::string locale = chromeos::StartupUtils::GetInitialLocale();
       prefs->SetString(prefs::kApplicationLocale, locale);
-      manager->EnableLayouts(
-          locale,
-          manager->GetInputMethodUtil()->GetHardwareInputMethodId());
+      manager->EnableLoginLayouts(
+          locale, manager->GetInputMethodUtil()->GetHardwareInputMethodId());
       base::ThreadRestrictions::ScopedAllowIO allow_io;
       const std::string loaded_locale =
           ResourceBundle::GetSharedInstance().ReloadLocaleResources(locale);
@@ -1181,10 +1180,6 @@ void ShowLoginWizard(const std::string& first_screen_name) {
   // initial locale and save it in preferences.
   DetermineAndSaveHardwareKeyboard(locale, layout);
 
-  // Then, enable the hardware keyboard.
-  manager->EnableLayouts(
-      locale, manager->GetInputMethodUtil()->GetHardwareInputMethodId());
-
   scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> data(
       new ShowLoginWizardSwitchLanguageCallbackData(
           first_screen_name, startup_manifest, display_host));
@@ -1193,8 +1188,9 @@ void ShowLoginWizard(const std::string& first_screen_name) {
       new locale_util::SwitchLanguageCallback(
           base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
 
-  // Do not load locale keyboards here.
-  locale_util::SwitchLanguage(locale, false, callback.Pass());
+  // Load locale keyboards here. Hardware layout would be automatically enabled.
+  locale_util::SwitchLanguage(
+      locale, true, true /* login_layouts_only */, callback.Pass());
 }
 
 }  // namespace chromeos