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

Side by Side Diff: chrome/browser/chromeos/preferences_browsertest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 25 matching lines...) Expand all
36 36
37 } // namespace 37 } // namespace
38 38
39 class PreferencesTest : public LoginManagerTest { 39 class PreferencesTest : public LoginManagerTest {
40 public: 40 public:
41 PreferencesTest() 41 PreferencesTest()
42 : LoginManagerTest(true), 42 : LoginManagerTest(true),
43 input_settings_(NULL), 43 input_settings_(NULL),
44 keyboard_(NULL) {} 44 keyboard_(NULL) {}
45 45
46 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 46 virtual void SetUpCommandLine(CommandLine* command_line) override {
47 LoginManagerTest::SetUpCommandLine(command_line); 47 LoginManagerTest::SetUpCommandLine(command_line);
48 command_line->AppendSwitch(switches::kStubCrosSettings); 48 command_line->AppendSwitch(switches::kStubCrosSettings);
49 } 49 }
50 50
51 virtual void SetUpOnMainThread() OVERRIDE { 51 virtual void SetUpOnMainThread() override {
52 LoginManagerTest::SetUpOnMainThread(); 52 LoginManagerTest::SetUpOnMainThread();
53 input_settings_ = new system::FakeInputDeviceSettings(); 53 input_settings_ = new system::FakeInputDeviceSettings();
54 system::InputDeviceSettings::SetSettingsForTesting(input_settings_); 54 system::InputDeviceSettings::SetSettingsForTesting(input_settings_);
55 keyboard_ = new input_method::FakeImeKeyboard(); 55 keyboard_ = new input_method::FakeImeKeyboard();
56 static_cast<input_method::InputMethodManagerImpl*>( 56 static_cast<input_method::InputMethodManagerImpl*>(
57 input_method::InputMethodManager::Get()) 57 input_method::InputMethodManager::Get())
58 ->SetImeKeyboardForTesting(keyboard_); 58 ->SetImeKeyboardForTesting(keyboard_);
59 CrosSettings::Get()->SetString(kDeviceOwner, kTestUsers[0]); 59 CrosSettings::Get()->SetString(kDeviceOwner, kTestUsers[0]);
60 } 60 }
61 61
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); 201 !prefs1->GetBoolean(prefs::kTapToClickEnabled));
202 CheckLocalStateCorrespondsToPrefs(prefs1); 202 CheckLocalStateCorrespondsToPrefs(prefs1);
203 203
204 // Switch user back. 204 // Switch user back.
205 user_manager->SwitchActiveUser(kTestUsers[0]); 205 user_manager->SwitchActiveUser(kTestUsers[0]);
206 CheckSettingsCorrespondToPrefs(prefs1); 206 CheckSettingsCorrespondToPrefs(prefs1);
207 CheckLocalStateCorrespondsToPrefs(prefs1); 207 CheckLocalStateCorrespondsToPrefs(prefs1);
208 } 208 }
209 209
210 } // namespace chromeos 210 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698