Chromium Code Reviews| Index: chrome/browser/chromeos/login/base_login_display_host.cc |
| diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc |
| index 5d70c27ddf9eb40b1abf59ed12104c6470b7fa25..8b8b3cdc343c4364166e1aa56a5019f21f8f4164 100644 |
| --- a/chrome/browser/chromeos/login/base_login_display_host.cc |
| +++ b/chrome/browser/chromeos/login/base_login_display_host.cc |
| @@ -28,6 +28,7 @@ |
| #include "chrome/browser/chromeos/login/webui_login_display_host.h" |
| #include "chrome/browser/chromeos/login/wizard_controller.h" |
| #include "chrome/browser/chromeos/mobile_config.h" |
| +#include "chrome/browser/chromeos/system/input_device_settings.h" |
| #include "chrome/browser/chromeos/system/timezone_settings.h" |
| #include "chrome/browser/policy/auto_enrollment_client.h" |
| #include "chrome/browser/policy/browser_policy_connector.h" |
| @@ -468,15 +469,20 @@ void ShowLoginWizard(const std::string& first_screen_name, |
| 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 = |
| - g_browser_process->local_state()->GetString( |
| - chromeos::language_prefs::kPreferredKeyboardLayout); |
| + 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); |
| + |
| + system::mouse_settings::SetPrimaryButtonRight( |
|
achuithb
2012/09/10 18:07:30
Please add a comment here about why this is necess
Dmitry Polukhin
2012/09/11 08:01:00
Done.
|
| + prefs->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight)); |
| + system::touchpad_settings::SetTapToClick( |
| + prefs->GetBoolean(prefs::kOwnerTapToClickEnabled)); |
| } |
| gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size)); |