| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 prefs->GetBoolean(prefs::kTapToClickEnabled)); | 114 prefs->GetBoolean(prefs::kTapToClickEnabled)); |
| 115 EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight), | 115 EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight), |
| 116 prefs->GetBoolean(prefs::kPrimaryMouseButtonRight)); | 116 prefs->GetBoolean(prefs::kPrimaryMouseButtonRight)); |
| 117 } | 117 } |
| 118 | 118 |
| 119 void DisableAnimations() { | 119 void DisableAnimations() { |
| 120 // Disable animations for user transitions. | 120 // Disable animations for user transitions. |
| 121 chrome::MultiUserWindowManagerChromeOS* manager = | 121 chrome::MultiUserWindowManagerChromeOS* manager = |
| 122 static_cast<chrome::MultiUserWindowManagerChromeOS*>( | 122 static_cast<chrome::MultiUserWindowManagerChromeOS*>( |
| 123 chrome::MultiUserWindowManager::GetInstance()); | 123 chrome::MultiUserWindowManager::GetInstance()); |
| 124 manager->SetAnimationsForTest(true); | 124 manager->SetAnimationSpeedForTest( |
| 125 chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED); |
| 125 } | 126 } |
| 126 | 127 |
| 127 private: | 128 private: |
| 128 system::FakeInputDeviceSettings* input_settings_; | 129 system::FakeInputDeviceSettings* input_settings_; |
| 129 input_method::FakeXKeyboard* xkeyboard_; | 130 input_method::FakeXKeyboard* xkeyboard_; |
| 130 | 131 |
| 131 DISALLOW_COPY_AND_ASSIGN(PreferencesTest); | 132 DISALLOW_COPY_AND_ASSIGN(PreferencesTest); |
| 132 }; | 133 }; |
| 133 | 134 |
| 134 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) { | 135 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); | 201 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); |
| 201 CheckLocalStateCorrespondsToPrefs(prefs1); | 202 CheckLocalStateCorrespondsToPrefs(prefs1); |
| 202 | 203 |
| 203 // Switch user back. | 204 // Switch user back. |
| 204 user_manager->SwitchActiveUser(kTestUsers[0]); | 205 user_manager->SwitchActiveUser(kTestUsers[0]); |
| 205 CheckSettingsCorrespondToPrefs(prefs1); | 206 CheckSettingsCorrespondToPrefs(prefs1); |
| 206 CheckLocalStateCorrespondsToPrefs(prefs1); | 207 CheckLocalStateCorrespondsToPrefs(prefs1); |
| 207 } | 208 } |
| 208 | 209 |
| 209 } // namespace chromeos | 210 } // namespace chromeos |
| OLD | NEW |