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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 8d298b45375ea8bae517dd267a759185c20e9d6e..887ef883c49210a38496e3edb1a4301f9063669f 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -37,18 +37,18 @@ class ControllerPairingScreen;
class EnrollmentScreen;
class ErrorScreen;
class EulaScreen;
+struct Geoposition;
class HIDDetectionScreen;
class HostPairingScreen;
-struct Geoposition;
class KioskAutolaunchScreen;
class KioskEnableScreen;
-class LocallyManagedUserCreationScreen;
class LoginDisplayHost;
class LoginScreenContext;
class NetworkScreen;
class OobeDisplay;
class ResetScreen;
class SimpleGeolocationProvider;
+class SupervisedUserCreationScreen;
class TermsOfServiceScreen;
class TimeZoneProvider;
struct TimeZoneResponseData;
@@ -145,7 +145,7 @@ class WizardController : public ScreenObserver {
TermsOfServiceScreen* GetTermsOfServiceScreen();
WrongHWIDScreen* GetWrongHWIDScreen();
AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen();
- LocallyManagedUserCreationScreen* GetLocallyManagedUserCreationScreen();
+ SupervisedUserCreationScreen* GetSupervisedUserCreationScreen();
HIDDetectionScreen* GetHIDDetectionScreen();
ControllerPairingScreen* GetControllerPairingScreen();
HostPairingScreen* GetHostPairingScreen();
@@ -172,7 +172,7 @@ class WizardController : public ScreenObserver {
static const char kTermsOfServiceScreenName[];
static const char kAutoEnrollmentCheckScreenName[];
static const char kWrongHWIDScreenName[];
- static const char kLocallyManagedUserCreationScreenName[];
+ static const char kSupervisedUserCreationScreenName[];
static const char kAppLaunchSplashScreenName[];
static const char kHIDDetectionScreenName[];
static const char kControllerPairingScreenName[];
@@ -194,7 +194,7 @@ class WizardController : public ScreenObserver {
void ShowTermsOfServiceScreen();
void ShowWrongHWIDScreen();
void ShowAutoEnrollmentCheckScreen();
- void ShowLocallyManagedUserCreationScreen();
+ void ShowSupervisedUserCreationScreen();
void ShowHIDDetectionScreen();
void ShowControllerPairingScreen();
void ShowHostPairingScreen();
@@ -332,8 +332,7 @@ class WizardController : public ScreenObserver {
scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_;
scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_;
scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_screen_;
- scoped_ptr<LocallyManagedUserCreationScreen>
- locally_managed_user_creation_screen_;
+ scoped_ptr<SupervisedUserCreationScreen> supervised_user_creation_screen_;
scoped_ptr<HIDDetectionScreen> hid_detection_screen_;
scoped_ptr<ControllerPairingScreen> controller_pairing_screen_;
scoped_ptr<HostPairingScreen> host_pairing_screen_;
« 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