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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager_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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/chromeos/accessibility/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include "ash/magnifier/magnification_controller.h" 7 #include "ash/magnifier/magnification_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 return imm->GetActiveIMEState()->GetCurrentInputMethod().id() == 219 return imm->GetActiveIMEState()->GetCurrentInputMethod().id() ==
220 extension_misc::kBrailleImeEngineId; 220 extension_misc::kBrailleImeEngineId;
221 } 221 }
222 } // anonymous namespace 222 } // anonymous namespace
223 223
224 class AccessibilityManagerTest : public InProcessBrowserTest { 224 class AccessibilityManagerTest : public InProcessBrowserTest {
225 protected: 225 protected:
226 AccessibilityManagerTest() : default_autoclick_delay_(0) {} 226 AccessibilityManagerTest() : default_autoclick_delay_(0) {}
227 virtual ~AccessibilityManagerTest() {} 227 virtual ~AccessibilityManagerTest() {}
228 228
229 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 229 virtual void SetUpCommandLine(CommandLine* command_line) override {
230 command_line->AppendSwitch(chromeos::switches::kLoginManager); 230 command_line->AppendSwitch(chromeos::switches::kLoginManager);
231 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, 231 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
232 TestingProfile::kTestUserProfileDir); 232 TestingProfile::kTestUserProfileDir);
233 } 233 }
234 234
235 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 235 virtual void SetUpInProcessBrowserTestFixture() override {
236 AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); 236 AccessibilityManager::SetBrailleControllerForTest(&braille_controller_);
237 } 237 }
238 238
239 virtual void SetUpOnMainThread() OVERRIDE { 239 virtual void SetUpOnMainThread() override {
240 // Sets the login-screen profile. 240 // Sets the login-screen profile.
241 AccessibilityManager::Get()-> 241 AccessibilityManager::Get()->
242 SetProfileForTest(ProfileHelper::GetSigninProfile()); 242 SetProfileForTest(ProfileHelper::GetSigninProfile());
243 default_autoclick_delay_ = GetAutoclickDelay(); 243 default_autoclick_delay_ = GetAutoclickDelay();
244 } 244 }
245 245
246 virtual void TearDownOnMainThread() OVERRIDE { 246 virtual void TearDownOnMainThread() override {
247 AccessibilityManager::SetBrailleControllerForTest(NULL); 247 AccessibilityManager::SetBrailleControllerForTest(NULL);
248 } 248 }
249 249
250 void SetBrailleDisplayAvailability(bool available) { 250 void SetBrailleDisplayAvailability(bool available) {
251 braille_controller_.SetAvailable(available); 251 braille_controller_.SetAvailable(available);
252 braille_controller_.GetObserver()->OnBrailleDisplayStateChanged( 252 braille_controller_.GetObserver()->OnBrailleDisplayStateChanged(
253 *braille_controller_.GetDisplayState()); 253 *braille_controller_.GetDisplayState());
254 } 254 }
255 255
256 int default_autoclick_delay() const { return default_autoclick_delay_; } 256 int default_autoclick_delay() const { return default_autoclick_delay_; }
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 EXPECT_FALSE(ShouldShowAccessibilityMenu()); 705 EXPECT_FALSE(ShouldShowAccessibilityMenu());
706 706
707 // Check on-screen keyboard. 707 // Check on-screen keyboard.
708 SetVirtualKeyboardEnabled(true); 708 SetVirtualKeyboardEnabled(true);
709 EXPECT_TRUE(ShouldShowAccessibilityMenu()); 709 EXPECT_TRUE(ShouldShowAccessibilityMenu());
710 SetVirtualKeyboardEnabled(false); 710 SetVirtualKeyboardEnabled(false);
711 EXPECT_FALSE(ShouldShowAccessibilityMenu()); 711 EXPECT_FALSE(ShouldShowAccessibilityMenu());
712 } 712 }
713 713
714 } // namespace chromeos 714 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698