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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.h

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 | Annotate | Revision Log
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_WIZARD_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 19 matching lines...) Expand all
30 class DictionaryValue; 30 class DictionaryValue;
31 } 31 }
32 32
33 namespace chromeos { 33 namespace chromeos {
34 34
35 class AutoEnrollmentCheckScreen; 35 class AutoEnrollmentCheckScreen;
36 class ControllerPairingScreen; 36 class ControllerPairingScreen;
37 class EnrollmentScreen; 37 class EnrollmentScreen;
38 class ErrorScreen; 38 class ErrorScreen;
39 class EulaScreen; 39 class EulaScreen;
40 struct Geoposition;
40 class HIDDetectionScreen; 41 class HIDDetectionScreen;
41 class HostPairingScreen; 42 class HostPairingScreen;
42 struct Geoposition;
43 class KioskAutolaunchScreen; 43 class KioskAutolaunchScreen;
44 class KioskEnableScreen; 44 class KioskEnableScreen;
45 class LocallyManagedUserCreationScreen;
46 class LoginDisplayHost; 45 class LoginDisplayHost;
47 class LoginScreenContext; 46 class LoginScreenContext;
48 class NetworkScreen; 47 class NetworkScreen;
49 class OobeDisplay; 48 class OobeDisplay;
50 class ResetScreen; 49 class ResetScreen;
51 class SimpleGeolocationProvider; 50 class SimpleGeolocationProvider;
51 class SupervisedUserCreationScreen;
52 class TermsOfServiceScreen; 52 class TermsOfServiceScreen;
53 class TimeZoneProvider; 53 class TimeZoneProvider;
54 struct TimeZoneResponseData; 54 struct TimeZoneResponseData;
55 class UpdateScreen; 55 class UpdateScreen;
56 class UserImageScreen; 56 class UserImageScreen;
57 class WizardScreen; 57 class WizardScreen;
58 class WrongHWIDScreen; 58 class WrongHWIDScreen;
59 59
60 // Class that manages control flow between wizard screens. Wizard controller 60 // Class that manages control flow between wizard screens. Wizard controller
61 // interacts with screen controllers to move the user between screens. 61 // interacts with screen controllers to move the user between screens.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 UpdateScreen* GetUpdateScreen(); 138 UpdateScreen* GetUpdateScreen();
139 UserImageScreen* GetUserImageScreen(); 139 UserImageScreen* GetUserImageScreen();
140 EulaScreen* GetEulaScreen(); 140 EulaScreen* GetEulaScreen();
141 EnrollmentScreen* GetEnrollmentScreen(); 141 EnrollmentScreen* GetEnrollmentScreen();
142 ResetScreen* GetResetScreen(); 142 ResetScreen* GetResetScreen();
143 KioskAutolaunchScreen* GetKioskAutolaunchScreen(); 143 KioskAutolaunchScreen* GetKioskAutolaunchScreen();
144 KioskEnableScreen* GetKioskEnableScreen(); 144 KioskEnableScreen* GetKioskEnableScreen();
145 TermsOfServiceScreen* GetTermsOfServiceScreen(); 145 TermsOfServiceScreen* GetTermsOfServiceScreen();
146 WrongHWIDScreen* GetWrongHWIDScreen(); 146 WrongHWIDScreen* GetWrongHWIDScreen();
147 AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen(); 147 AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen();
148 LocallyManagedUserCreationScreen* GetLocallyManagedUserCreationScreen(); 148 SupervisedUserCreationScreen* GetSupervisedUserCreationScreen();
149 HIDDetectionScreen* GetHIDDetectionScreen(); 149 HIDDetectionScreen* GetHIDDetectionScreen();
150 ControllerPairingScreen* GetControllerPairingScreen(); 150 ControllerPairingScreen* GetControllerPairingScreen();
151 HostPairingScreen* GetHostPairingScreen(); 151 HostPairingScreen* GetHostPairingScreen();
152 152
153 // Returns a pointer to the current screen or NULL if there's no such 153 // Returns a pointer to the current screen or NULL if there's no such
154 // screen. 154 // screen.
155 WizardScreen* current_screen() const { return current_screen_; } 155 WizardScreen* current_screen() const { return current_screen_; }
156 156
157 // Returns true if the current wizard instance has reached the login screen. 157 // Returns true if the current wizard instance has reached the login screen.
158 bool login_screen_started() const { return login_screen_started_; } 158 bool login_screen_started() const { return login_screen_started_; }
159 159
160 static const char kNetworkScreenName[]; 160 static const char kNetworkScreenName[];
161 static const char kLoginScreenName[]; 161 static const char kLoginScreenName[];
162 static const char kUpdateScreenName[]; 162 static const char kUpdateScreenName[];
163 static const char kUserImageScreenName[]; 163 static const char kUserImageScreenName[];
164 static const char kOutOfBoxScreenName[]; 164 static const char kOutOfBoxScreenName[];
165 static const char kTestNoScreenName[]; 165 static const char kTestNoScreenName[];
166 static const char kEulaScreenName[]; 166 static const char kEulaScreenName[];
167 static const char kEnrollmentScreenName[]; 167 static const char kEnrollmentScreenName[];
168 static const char kResetScreenName[]; 168 static const char kResetScreenName[];
169 static const char kKioskEnableScreenName[]; 169 static const char kKioskEnableScreenName[];
170 static const char kKioskAutolaunchScreenName[]; 170 static const char kKioskAutolaunchScreenName[];
171 static const char kErrorScreenName[]; 171 static const char kErrorScreenName[];
172 static const char kTermsOfServiceScreenName[]; 172 static const char kTermsOfServiceScreenName[];
173 static const char kAutoEnrollmentCheckScreenName[]; 173 static const char kAutoEnrollmentCheckScreenName[];
174 static const char kWrongHWIDScreenName[]; 174 static const char kWrongHWIDScreenName[];
175 static const char kLocallyManagedUserCreationScreenName[]; 175 static const char kSupervisedUserCreationScreenName[];
176 static const char kAppLaunchSplashScreenName[]; 176 static const char kAppLaunchSplashScreenName[];
177 static const char kHIDDetectionScreenName[]; 177 static const char kHIDDetectionScreenName[];
178 static const char kControllerPairingScreenName[]; 178 static const char kControllerPairingScreenName[];
179 static const char kHostPairingScreenName[]; 179 static const char kHostPairingScreenName[];
180 180
181 // Volume percent at which spoken feedback is still audible. 181 // Volume percent at which spoken feedback is still audible.
182 static const int kMinAudibleOutputVolumePercent; 182 static const int kMinAudibleOutputVolumePercent;
183 183
184 private: 184 private:
185 // Show specific screen. 185 // Show specific screen.
186 void ShowNetworkScreen(); 186 void ShowNetworkScreen();
187 void ShowUpdateScreen(); 187 void ShowUpdateScreen();
188 void ShowUserImageScreen(); 188 void ShowUserImageScreen();
189 void ShowEulaScreen(); 189 void ShowEulaScreen();
190 void ShowEnrollmentScreen(); 190 void ShowEnrollmentScreen();
191 void ShowResetScreen(); 191 void ShowResetScreen();
192 void ShowKioskAutolaunchScreen(); 192 void ShowKioskAutolaunchScreen();
193 void ShowKioskEnableScreen(); 193 void ShowKioskEnableScreen();
194 void ShowTermsOfServiceScreen(); 194 void ShowTermsOfServiceScreen();
195 void ShowWrongHWIDScreen(); 195 void ShowWrongHWIDScreen();
196 void ShowAutoEnrollmentCheckScreen(); 196 void ShowAutoEnrollmentCheckScreen();
197 void ShowLocallyManagedUserCreationScreen(); 197 void ShowSupervisedUserCreationScreen();
198 void ShowHIDDetectionScreen(); 198 void ShowHIDDetectionScreen();
199 void ShowControllerPairingScreen(); 199 void ShowControllerPairingScreen();
200 void ShowHostPairingScreen(); 200 void ShowHostPairingScreen();
201 201
202 // Shows images login screen. 202 // Shows images login screen.
203 void ShowLoginScreen(const LoginScreenContext& context); 203 void ShowLoginScreen(const LoginScreenContext& context);
204 204
205 // Resumes a pending login screen. 205 // Resumes a pending login screen.
206 void ResumeLoginScreen(); 206 void ResumeLoginScreen();
207 207
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 scoped_ptr<UserImageScreen> user_image_screen_; 325 scoped_ptr<UserImageScreen> user_image_screen_;
326 scoped_ptr<EulaScreen> eula_screen_; 326 scoped_ptr<EulaScreen> eula_screen_;
327 scoped_ptr<ResetScreen> reset_screen_; 327 scoped_ptr<ResetScreen> reset_screen_;
328 scoped_ptr<KioskAutolaunchScreen> autolaunch_screen_; 328 scoped_ptr<KioskAutolaunchScreen> autolaunch_screen_;
329 scoped_ptr<KioskEnableScreen> kiosk_enable_screen_; 329 scoped_ptr<KioskEnableScreen> kiosk_enable_screen_;
330 scoped_ptr<EnrollmentScreen> enrollment_screen_; 330 scoped_ptr<EnrollmentScreen> enrollment_screen_;
331 scoped_ptr<ErrorScreen> error_screen_; 331 scoped_ptr<ErrorScreen> error_screen_;
332 scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_; 332 scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_;
333 scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_; 333 scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_;
334 scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_screen_; 334 scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_screen_;
335 scoped_ptr<LocallyManagedUserCreationScreen> 335 scoped_ptr<SupervisedUserCreationScreen> supervised_user_creation_screen_;
336 locally_managed_user_creation_screen_;
337 scoped_ptr<HIDDetectionScreen> hid_detection_screen_; 336 scoped_ptr<HIDDetectionScreen> hid_detection_screen_;
338 scoped_ptr<ControllerPairingScreen> controller_pairing_screen_; 337 scoped_ptr<ControllerPairingScreen> controller_pairing_screen_;
339 scoped_ptr<HostPairingScreen> host_pairing_screen_; 338 scoped_ptr<HostPairingScreen> host_pairing_screen_;
340 339
341 // Screen that's currently active. 340 // Screen that's currently active.
342 WizardScreen* current_screen_; 341 WizardScreen* current_screen_;
343 342
344 // Screen that was active before, or NULL for login screen. 343 // Screen that was active before, or NULL for login screen.
345 WizardScreen* previous_screen_; 344 WizardScreen* previous_screen_;
346 345
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 base::Closure on_timezone_resolved_for_testing_; 419 base::Closure on_timezone_resolved_for_testing_;
421 420
422 base::WeakPtrFactory<WizardController> weak_factory_; 421 base::WeakPtrFactory<WizardController> weak_factory_;
423 422
424 DISALLOW_COPY_AND_ASSIGN(WizardController); 423 DISALLOW_COPY_AND_ASSIGN(WizardController);
425 }; 424 };
426 425
427 } // namespace chromeos 426 } // namespace chromeos
428 427
429 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 428 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/user_manager_unittest.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698