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

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

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 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"
(...skipping 14 matching lines...) Expand all
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 virtual void OnCurrentScreenChanged(
34 OobeDisplay::Screen current_screen, 34 OobeDisplay::Screen current_screen,
35 OobeDisplay::Screen new_screen) OVERRIDE; 35 OobeDisplay::Screen new_screen) override;
36 36
37 private: 37 private:
38 OobeUI* GetOobeUI(); 38 OobeUI* GetOobeUI();
39 39
40 bool waiting_for_screen_; 40 bool waiting_for_screen_;
41 OobeDisplay::Screen expected_screen_; 41 OobeDisplay::Screen expected_screen_;
42 scoped_refptr<content::MessageLoopRunner> runner_; 42 scoped_refptr<content::MessageLoopRunner> runner_;
43 43
44 DISALLOW_COPY_AND_ASSIGN(OobeScreenWaiter); 44 DISALLOW_COPY_AND_ASSIGN(OobeScreenWaiter);
45 }; 45 };
46 46
47 } // namespace chromeos 47 } // namespace chromeos
48 48
49 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_ 49 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698