Default keyboard layout should be set considering owners preference.

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

 // Copyright (c) 2013 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/signin_screen_handler.h"
 
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 1000 matching lines @@
   }
 }
 
 void SigninScreenHandler::OnDnsCleared() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   dns_clear_task_running_ = false;
   dns_cleared_ = true;
   ShowSigninScreenIfReady();
 }
 
-void SigninScreenHandler::SetUserInputMethodHWDefault() {
-  chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::Get();
-  manager->ChangeInputMethod(
-      manager->GetInputMethodUtil()->GetHardwareInputMethodId());
-}
-
 // Update keyboard layout to least recently used by the user.
 void SigninScreenHandler::SetUserInputMethod(const std::string& username) {
   chromeos::input_method::InputMethodManager* const manager =
       chromeos::input_method::InputMethodManager::Get();
 
-  const chromeos::input_method::InputMethodUtil& ime_util =
-      *manager->GetInputMethodUtil();
-
   const bool succeed = SetUserInputMethodImpl(username, manager);
 
   // This is also a case when LRU layout is set only for a few local users,
   // thus others need to be switched to default locale.
   // Otherwise they will end up using another user's locale to log in.
   if (!succeed) {
     DLOG(INFO) << "SetUserInputMethod('" << username
-               << "'): failed to set user layout. Switching to default '"
-               << ime_util.GetHardwareInputMethodId() << "'";
+               << "'): failed to set user layout. Switching to default.";
 
-    SetUserInputMethodHWDefault();
+    manager->SetInputMethodDefault();
   }
 }
 
 void SigninScreenHandler::ShowSigninScreenIfReady() {
   if (!dns_cleared_ || !cookies_cleared_ || !delegate_)
     return;
 
   std::string active_network_path = network_state_informer_->network_path();
   if (gaia_silent_load_ &&
       (network_state_informer_->state() != NetworkStateInformer::ONLINE ||
@@ skipping 701 matching lines @@
   rvh->ExecuteJavascriptInWebFrame(
       ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
       ASCIIToUTF16(code));
 
   // Test properties are cleared in HandleCompleteLogin because the form
   // submission might fail and login will not be attempted after reloading
   // if they are cleared here.
 }
 
 }  // namespace chromeos