OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <sys/types.h> | 5 #include <sys/types.h> |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 input_settings_->current_touchpad_settings().GetSensitivity()); | 96 input_settings_->current_touchpad_settings().GetSensitivity()); |
97 EXPECT_EQ(prefs->GetBoolean(prefs::kTouchHudProjectionEnabled), | 97 EXPECT_EQ(prefs->GetBoolean(prefs::kTouchHudProjectionEnabled), |
98 ash::Shell::GetInstance()->is_touch_hud_projection_enabled()); | 98 ash::Shell::GetInstance()->is_touch_hud_projection_enabled()); |
99 EXPECT_EQ(prefs->GetBoolean(prefs::kLanguageXkbAutoRepeatEnabled), | 99 EXPECT_EQ(prefs->GetBoolean(prefs::kLanguageXkbAutoRepeatEnabled), |
100 keyboard_->auto_repeat_is_enabled_); | 100 keyboard_->auto_repeat_is_enabled_); |
101 input_method::AutoRepeatRate rate = keyboard_->last_auto_repeat_rate_; | 101 input_method::AutoRepeatRate rate = keyboard_->last_auto_repeat_rate_; |
102 EXPECT_EQ(prefs->GetInteger(prefs::kLanguageXkbAutoRepeatDelay), | 102 EXPECT_EQ(prefs->GetInteger(prefs::kLanguageXkbAutoRepeatDelay), |
103 (int)rate.initial_delay_in_ms); | 103 (int)rate.initial_delay_in_ms); |
104 EXPECT_EQ(prefs->GetInteger(prefs::kLanguageXkbAutoRepeatInterval), | 104 EXPECT_EQ(prefs->GetInteger(prefs::kLanguageXkbAutoRepeatInterval), |
105 (int)rate.repeat_interval_in_ms); | 105 (int)rate.repeat_interval_in_ms); |
106 EXPECT_EQ( | 106 EXPECT_EQ(prefs->GetString(prefs::kLanguageCurrentInputMethod), |
107 prefs->GetString(prefs::kLanguageCurrentInputMethod), | 107 input_method::InputMethodManager::Get() |
108 input_method::InputMethodManager::Get()->GetCurrentInputMethod().id()); | 108 ->GetActiveIMEState() |
| 109 ->GetCurrentInputMethod() |
| 110 .id()); |
109 } | 111 } |
110 | 112 |
111 void CheckLocalStateCorrespondsToPrefs(PrefService* prefs) { | 113 void CheckLocalStateCorrespondsToPrefs(PrefService* prefs) { |
112 PrefService* local_state = g_browser_process->local_state(); | 114 PrefService* local_state = g_browser_process->local_state(); |
113 EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerTapToClickEnabled), | 115 EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerTapToClickEnabled), |
114 prefs->GetBoolean(prefs::kTapToClickEnabled)); | 116 prefs->GetBoolean(prefs::kTapToClickEnabled)); |
115 EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight), | 117 EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight), |
116 prefs->GetBoolean(prefs::kPrimaryMouseButtonRight)); | 118 prefs->GetBoolean(prefs::kPrimaryMouseButtonRight)); |
117 } | 119 } |
118 | 120 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); | 201 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); |
200 CheckLocalStateCorrespondsToPrefs(prefs1); | 202 CheckLocalStateCorrespondsToPrefs(prefs1); |
201 | 203 |
202 // Switch user back. | 204 // Switch user back. |
203 user_manager->SwitchActiveUser(kTestUsers[0]); | 205 user_manager->SwitchActiveUser(kTestUsers[0]); |
204 CheckSettingsCorrespondToPrefs(prefs1); | 206 CheckSettingsCorrespondToPrefs(prefs1); |
205 CheckLocalStateCorrespondsToPrefs(prefs1); | 207 CheckLocalStateCorrespondsToPrefs(prefs1); |
206 } | 208 } |
207 | 209 |
208 } // namespace chromeos | 210 } // namespace chromeos |
OLD | NEW |