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

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: 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 21 matching lines...) Expand all
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 class HIDDetectionScreen; 40 class HIDDetectionScreen;
41 class HostPairingScreen; 41 class HostPairingScreen;
42 struct Geoposition; 42 struct Geoposition;
Pam (message me for reviews) 2014/07/16 18:12:36 while you're here, alphabetize
Marc Treib 2014/07/17 08:58:39 Done.
43 class KioskAutolaunchScreen; 43 class KioskAutolaunchScreen;
44 class KioskEnableScreen; 44 class KioskEnableScreen;
45 class LocallyManagedUserCreationScreen; 45 class SupervisedUserCreationScreen;
Pam (message me for reviews) 2014/07/16 18:12:36 alphabetize
Marc Treib 2014/07/17 08:58:39 Done.
46 class LoginDisplayHost; 46 class LoginDisplayHost;
47 class LoginScreenContext; 47 class LoginScreenContext;
48 class NetworkScreen; 48 class NetworkScreen;
49 class OobeDisplay; 49 class OobeDisplay;
50 class ResetScreen; 50 class ResetScreen;
51 class SimpleGeolocationProvider; 51 class SimpleGeolocationProvider;
52 class TermsOfServiceScreen; 52 class TermsOfServiceScreen;
53 class TimeZoneProvider; 53 class TimeZoneProvider;
54 struct TimeZoneResponseData; 54 struct TimeZoneResponseData;
55 class UpdateScreen; 55 class UpdateScreen;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 UpdateScreen* GetUpdateScreen(); 134 UpdateScreen* GetUpdateScreen();
135 UserImageScreen* GetUserImageScreen(); 135 UserImageScreen* GetUserImageScreen();
136 EulaScreen* GetEulaScreen(); 136 EulaScreen* GetEulaScreen();
137 EnrollmentScreen* GetEnrollmentScreen(); 137 EnrollmentScreen* GetEnrollmentScreen();
138 ResetScreen* GetResetScreen(); 138 ResetScreen* GetResetScreen();
139 KioskAutolaunchScreen* GetKioskAutolaunchScreen(); 139 KioskAutolaunchScreen* GetKioskAutolaunchScreen();
140 KioskEnableScreen* GetKioskEnableScreen(); 140 KioskEnableScreen* GetKioskEnableScreen();
141 TermsOfServiceScreen* GetTermsOfServiceScreen(); 141 TermsOfServiceScreen* GetTermsOfServiceScreen();
142 WrongHWIDScreen* GetWrongHWIDScreen(); 142 WrongHWIDScreen* GetWrongHWIDScreen();
143 AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen(); 143 AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen();
144 LocallyManagedUserCreationScreen* GetLocallyManagedUserCreationScreen(); 144 SupervisedUserCreationScreen* GetSupervisedUserCreationScreen();
145 HIDDetectionScreen* GetHIDDetectionScreen(); 145 HIDDetectionScreen* GetHIDDetectionScreen();
146 ControllerPairingScreen* GetControllerPairingScreen(); 146 ControllerPairingScreen* GetControllerPairingScreen();
147 HostPairingScreen* GetHostPairingScreen(); 147 HostPairingScreen* GetHostPairingScreen();
148 148
149 // Returns a pointer to the current screen or NULL if there's no such 149 // Returns a pointer to the current screen or NULL if there's no such
150 // screen. 150 // screen.
151 WizardScreen* current_screen() const { return current_screen_; } 151 WizardScreen* current_screen() const { return current_screen_; }
152 152
153 // Returns true if the current wizard instance has reached the login screen. 153 // Returns true if the current wizard instance has reached the login screen.
154 bool login_screen_started() const { return login_screen_started_; } 154 bool login_screen_started() const { return login_screen_started_; }
155 155
156 static const char kNetworkScreenName[]; 156 static const char kNetworkScreenName[];
157 static const char kLoginScreenName[]; 157 static const char kLoginScreenName[];
158 static const char kUpdateScreenName[]; 158 static const char kUpdateScreenName[];
159 static const char kUserImageScreenName[]; 159 static const char kUserImageScreenName[];
160 static const char kOutOfBoxScreenName[]; 160 static const char kOutOfBoxScreenName[];
161 static const char kTestNoScreenName[]; 161 static const char kTestNoScreenName[];
162 static const char kEulaScreenName[]; 162 static const char kEulaScreenName[];
163 static const char kEnrollmentScreenName[]; 163 static const char kEnrollmentScreenName[];
164 static const char kResetScreenName[]; 164 static const char kResetScreenName[];
165 static const char kKioskEnableScreenName[]; 165 static const char kKioskEnableScreenName[];
166 static const char kKioskAutolaunchScreenName[]; 166 static const char kKioskAutolaunchScreenName[];
167 static const char kErrorScreenName[]; 167 static const char kErrorScreenName[];
168 static const char kTermsOfServiceScreenName[]; 168 static const char kTermsOfServiceScreenName[];
169 static const char kAutoEnrollmentCheckScreenName[]; 169 static const char kAutoEnrollmentCheckScreenName[];
170 static const char kWrongHWIDScreenName[]; 170 static const char kWrongHWIDScreenName[];
171 static const char kLocallyManagedUserCreationScreenName[]; 171 static const char kSupervisedUserCreationScreenName[];
172 static const char kAppLaunchSplashScreenName[]; 172 static const char kAppLaunchSplashScreenName[];
173 static const char kHIDDetectionScreenName[]; 173 static const char kHIDDetectionScreenName[];
174 static const char kControllerPairingScreenName[]; 174 static const char kControllerPairingScreenName[];
175 static const char kHostPairingScreenName[]; 175 static const char kHostPairingScreenName[];
176 176
177 // Volume percent at which spoken feedback is still audible. 177 // Volume percent at which spoken feedback is still audible.
178 static const int kMinAudibleOutputVolumePercent; 178 static const int kMinAudibleOutputVolumePercent;
179 179
180 private: 180 private:
181 // Show specific screen. 181 // Show specific screen.
182 void ShowNetworkScreen(); 182 void ShowNetworkScreen();
183 void ShowUpdateScreen(); 183 void ShowUpdateScreen();
184 void ShowUserImageScreen(); 184 void ShowUserImageScreen();
185 void ShowEulaScreen(); 185 void ShowEulaScreen();
186 void ShowEnrollmentScreen(); 186 void ShowEnrollmentScreen();
187 void ShowResetScreen(); 187 void ShowResetScreen();
188 void ShowKioskAutolaunchScreen(); 188 void ShowKioskAutolaunchScreen();
189 void ShowKioskEnableScreen(); 189 void ShowKioskEnableScreen();
190 void ShowTermsOfServiceScreen(); 190 void ShowTermsOfServiceScreen();
191 void ShowWrongHWIDScreen(); 191 void ShowWrongHWIDScreen();
192 void ShowAutoEnrollmentCheckScreen(); 192 void ShowAutoEnrollmentCheckScreen();
193 void ShowLocallyManagedUserCreationScreen(); 193 void ShowSupervisedUserCreationScreen();
194 void ShowHIDDetectionScreen(); 194 void ShowHIDDetectionScreen();
195 void ShowControllerPairingScreen(); 195 void ShowControllerPairingScreen();
196 void ShowHostPairingScreen(); 196 void ShowHostPairingScreen();
197 197
198 // Shows images login screen. 198 // Shows images login screen.
199 void ShowLoginScreen(const LoginScreenContext& context); 199 void ShowLoginScreen(const LoginScreenContext& context);
200 200
201 // Resumes a pending login screen. 201 // Resumes a pending login screen.
202 void ResumeLoginScreen(); 202 void ResumeLoginScreen();
203 203
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 scoped_ptr<UserImageScreen> user_image_screen_; 321 scoped_ptr<UserImageScreen> user_image_screen_;
322 scoped_ptr<EulaScreen> eula_screen_; 322 scoped_ptr<EulaScreen> eula_screen_;
323 scoped_ptr<ResetScreen> reset_screen_; 323 scoped_ptr<ResetScreen> reset_screen_;
324 scoped_ptr<KioskAutolaunchScreen> autolaunch_screen_; 324 scoped_ptr<KioskAutolaunchScreen> autolaunch_screen_;
325 scoped_ptr<KioskEnableScreen> kiosk_enable_screen_; 325 scoped_ptr<KioskEnableScreen> kiosk_enable_screen_;
326 scoped_ptr<EnrollmentScreen> enrollment_screen_; 326 scoped_ptr<EnrollmentScreen> enrollment_screen_;
327 scoped_ptr<ErrorScreen> error_screen_; 327 scoped_ptr<ErrorScreen> error_screen_;
328 scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_; 328 scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_;
329 scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_; 329 scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_;
330 scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_screen_; 330 scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_screen_;
331 scoped_ptr<LocallyManagedUserCreationScreen> 331 scoped_ptr<SupervisedUserCreationScreen> supervised_user_creation_screen_;
332 locally_managed_user_creation_screen_;
333 scoped_ptr<HIDDetectionScreen> hid_detection_screen_; 332 scoped_ptr<HIDDetectionScreen> hid_detection_screen_;
334 scoped_ptr<ControllerPairingScreen> controller_pairing_screen_; 333 scoped_ptr<ControllerPairingScreen> controller_pairing_screen_;
335 scoped_ptr<HostPairingScreen> host_pairing_screen_; 334 scoped_ptr<HostPairingScreen> host_pairing_screen_;
336 335
337 // Screen that's currently active. 336 // Screen that's currently active.
338 WizardScreen* current_screen_; 337 WizardScreen* current_screen_;
339 338
340 // Screen that was active before, or NULL for login screen. 339 // Screen that was active before, or NULL for login screen.
341 WizardScreen* previous_screen_; 340 WizardScreen* previous_screen_;
342 341
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 base::Closure on_timezone_resolved_for_testing_; 411 base::Closure on_timezone_resolved_for_testing_;
413 412
414 base::WeakPtrFactory<WizardController> weak_factory_; 413 base::WeakPtrFactory<WizardController> weak_factory_;
415 414
416 DISALLOW_COPY_AND_ASSIGN(WizardController); 415 DISALLOW_COPY_AND_ASSIGN(WizardController);
417 }; 416 };
418 417
419 } // namespace chromeos 418 } // namespace chromeos
420 419
421 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 420 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698