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

Side by Side Diff: chrome/browser/chromeos/login/test/oobe_screen_waiter.h

Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "chrome/browser/chromeos/login/ui/oobe_display.h" 9 #include "chrome/browser/chromeos/login/ui/oobe_display.h"
10 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 10 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
11 11
12 namespace content { 12 namespace content {
13 class MessageLoopRunner; 13 class MessageLoopRunner;
14 } 14 }
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 // A waiter that blocks until the expected oobe screen is reached. 18 // A waiter that blocks until the expected oobe screen is reached.
19 class OobeScreenWaiter : public OobeUI::Observer { 19 class OobeScreenWaiter : public OobeUI::Observer {
20 public: 20 public:
21 explicit OobeScreenWaiter(OobeDisplay::Screen expected_screen); 21 explicit OobeScreenWaiter(OobeDisplay::Screen expected_screen);
22 virtual ~OobeScreenWaiter(); 22 ~OobeScreenWaiter() override;
23 23
24 // Run message loop to wait for the expected_screen. 24 // Run message loop to wait for the expected_screen.
25 void Wait(); 25 void Wait();
26 26
27 // Similar to Wait() but does not assert the current screen is 27 // Similar to Wait() but does not assert the current screen is
28 // expected_screen on exit. Use this when there are multiple screen changes 28 // expected_screen on exit. Use this when there are multiple screen changes
29 // during the wait and the screen to be waited is not the final one. 29 // during the wait and the screen to be waited is not the final one.
30 void WaitNoAssertCurrentScreen(); 30 void WaitNoAssertCurrentScreen();
31 31
32 // OobeUI::Observer implementation: 32 // OobeUI::Observer implementation:
33 virtual void OnCurrentScreenChanged( 33 void OnCurrentScreenChanged(OobeDisplay::Screen current_screen,
34 OobeDisplay::Screen current_screen, 34 OobeDisplay::Screen new_screen) override;
35 OobeDisplay::Screen new_screen) override;
36 35
37 private: 36 private:
38 OobeUI* GetOobeUI(); 37 OobeUI* GetOobeUI();
39 38
40 bool waiting_for_screen_; 39 bool waiting_for_screen_;
41 OobeDisplay::Screen expected_screen_; 40 OobeDisplay::Screen expected_screen_;
42 scoped_refptr<content::MessageLoopRunner> runner_; 41 scoped_refptr<content::MessageLoopRunner> runner_;
43 42
44 DISALLOW_COPY_AND_ASSIGN(OobeScreenWaiter); 43 DISALLOW_COPY_AND_ASSIGN(OobeScreenWaiter);
45 }; 44 };
46 45
47 } // namespace chromeos 46 } // namespace chromeos
48 47
49 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_ 48 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698