Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5396)

Unified Diff: chrome/browser/chromeos/login/login_display_host_impl.cc

Issue 23608003: Default keyboard layout should be set considering owners preference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8da65b469abd3e188199fccb29f076b9e9e1f4bd..b2be49357ca71588a9bcae4c65371d583c46d688 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -857,18 +857,9 @@ void ShowLoginWizard(const std::string& first_screen_name) {
// Set up keyboards. For example, when |locale| is "en-US", enable US qwerty
// and US dvorak keyboard layouts.
if (g_browser_process && g_browser_process->local_state()) {
- const std::string locale = g_browser_process->GetApplicationLocale();
- // If the preferred keyboard for the login screen has been saved, use it.
- PrefService* prefs = g_browser_process->local_state();
- std::string initial_input_method_id =
- prefs->GetString(chromeos::language_prefs::kPreferredKeyboardLayout);
- if (initial_input_method_id.empty()) {
- // If kPreferredKeyboardLayout is not specified, use the hardware layout.
- initial_input_method_id =
- manager->GetInputMethodUtil()->GetHardwareInputMethodId();
- }
- manager->EnableLayouts(locale, initial_input_method_id);
+ manager->SetInputMethodDefault();
+ PrefService* prefs = g_browser_process->local_state();
// Apply owner preferences for tap-to-click and mouse buttons swap for
// login screen.
system::mouse_settings::SetPrimaryButtonRight(

Powered by Google App Engine
This is Rietveld 408576698