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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.h

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 1 month 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_ENROLLMENT_ENROLLMENT_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 10 matching lines...) Expand all
21 namespace base { 21 namespace base {
22 class ElapsedTimer; 22 class ElapsedTimer;
23 } 23 }
24 24
25 namespace pairing_chromeos { 25 namespace pairing_chromeos {
26 class ControllerPairingController; 26 class ControllerPairingController;
27 } 27 }
28 28
29 namespace chromeos { 29 namespace chromeos {
30 30
31 class BaseScreenDelegate;
31 class ScreenManager; 32 class ScreenManager;
32 class ScreenObserver;
33 33
34 // The screen implementation that links the enterprise enrollment UI into the 34 // The screen implementation that links the enterprise enrollment UI into the
35 // OOBE wizard. 35 // OOBE wizard.
36 class EnrollmentScreen 36 class EnrollmentScreen
37 : public BaseScreen, 37 : public BaseScreen,
38 public pairing_chromeos::HostPairingController::Observer, 38 public pairing_chromeos::HostPairingController::Observer,
39 public EnrollmentScreenActor::Controller { 39 public EnrollmentScreenActor::Controller {
40 public: 40 public:
41 typedef pairing_chromeos::HostPairingController::Stage Stage; 41 typedef pairing_chromeos::HostPairingController::Stage Stage;
42 42
43 EnrollmentScreen(ScreenObserver* observer, 43 EnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
44 EnrollmentScreenActor* actor); 44 EnrollmentScreenActor* actor);
45 virtual ~EnrollmentScreen(); 45 virtual ~EnrollmentScreen();
46 46
47 static EnrollmentScreen* Get(ScreenManager* manager); 47 static EnrollmentScreen* Get(ScreenManager* manager);
48 48
49 // Setup how this screen will handle enrollment. 49 // Setup how this screen will handle enrollment.
50 // |shark_controller| is an interface that is used to communicate with a 50 // |shark_controller| is an interface that is used to communicate with a
51 // remora device for remote enrollment. 51 // remora device for remote enrollment.
52 // |remora_controller| is an interface that is used to communicate with a 52 // |remora_controller| is an interface that is used to communicate with a
53 // shark device for remote enrollment. 53 // shark device for remote enrollment.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 std::string user_; 133 std::string user_;
134 scoped_ptr<base::ElapsedTimer> elapsed_timer_; 134 scoped_ptr<base::ElapsedTimer> elapsed_timer_;
135 base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_; 135 base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_;
136 136
137 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen); 137 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);
138 }; 138 };
139 139
140 } // namespace chromeos 140 } // namespace chromeos
141 141
142 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_ 142 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698