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

Side by Side Diff: chrome/browser/chromeos/login/ui/user_adding_screen_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 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 "ash/session/session_state_delegate.h" 5 #include "ash/session/session_state_delegate.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 9 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
10 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" 10 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
(...skipping 23 matching lines...) Expand all
34 namespace chromeos { 34 namespace chromeos {
35 35
36 class UserAddingScreenTest : public LoginManagerTest, 36 class UserAddingScreenTest : public LoginManagerTest,
37 public UserAddingScreen::Observer { 37 public UserAddingScreen::Observer {
38 public: 38 public:
39 UserAddingScreenTest() : LoginManagerTest(false), 39 UserAddingScreenTest() : LoginManagerTest(false),
40 user_adding_started_(0), 40 user_adding_started_(0),
41 user_adding_finished_(0) { 41 user_adding_finished_(0) {
42 } 42 }
43 43
44 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 44 virtual void SetUpInProcessBrowserTestFixture() override {
45 LoginManagerTest::SetUpInProcessBrowserTestFixture(); 45 LoginManagerTest::SetUpInProcessBrowserTestFixture();
46 UserAddingScreen::Get()->AddObserver(this); 46 UserAddingScreen::Get()->AddObserver(this);
47 } 47 }
48 48
49 virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; } 49 virtual void OnUserAddingFinished() override { ++user_adding_finished_; }
50 50
51 virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; } 51 virtual void OnUserAddingStarted() override { ++user_adding_started_; }
52 52
53 void SetUserCanLock(user_manager::User* user, bool can_lock) { 53 void SetUserCanLock(user_manager::User* user, bool can_lock) {
54 user->set_can_lock(can_lock); 54 user->set_can_lock(can_lock);
55 } 55 }
56 56
57 void CheckScreenIsVisible() { 57 void CheckScreenIsVisible() {
58 views::View* web_view = 58 views::View* web_view =
59 LoginDisplayHostImpl::default_host()->GetWebUILoginView()->child_at(0); 59 LoginDisplayHostImpl::default_host()->GetWebUILoginView()->child_at(0);
60 for (views::View* current_view = web_view; 60 for (views::View* current_view = web_view;
61 current_view; 61 current_view;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 content::NotificationService::AllSources()).Wait(); 264 content::NotificationService::AllSources()).Wait();
265 265
266 UserAddingScreen::Get()->Start(); 266 UserAddingScreen::Get()->Start();
267 content::RunAllPendingInMessageLoop(); 267 content::RunAllPendingInMessageLoop();
268 CheckScreenIsVisible(); 268 CheckScreenIsVisible();
269 UserAddingScreen::Get()->Cancel(); 269 UserAddingScreen::Get()->Cancel();
270 content::RunAllPendingInMessageLoop(); 270 content::RunAllPendingInMessageLoop();
271 } 271 }
272 272
273 } // namespace chromeos 273 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698