chrome/browser/chromeos/login/ui/oobe_display.h - Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/ui/oobe_display.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

« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc ('k') | chrome/browser/chromeos/login/users/fake_supervised_user_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/oobe_display.h

diff --git a/chrome/browser/chromeos/login/ui/oobe_display.h b/chrome/browser/chromeos/login/ui/oobe_display.h

index ea7cafaba961a92946c905450f17df5e0a470d5f..60155425f0785b6523c74caf62e6925c29525f0f 100644

--- a/chrome/browser/chromeos/login/ui/oobe_display.h

+++ b/chrome/browser/chromeos/login/ui/oobe_display.h

@@ -23,9 +23,9 @@ class HIDDetectionScreenActor;

class HostPairingScreenActor;

class KioskAutolaunchScreenActor;

class KioskEnableScreenActor;

-class LocallyManagedUserCreationScreenHandler;

class NetworkScreenActor;

class ResetScreenActor;

+class SupervisedUserCreationScreenHandler;

class TermsOfServiceScreenActor;

class UpdateScreenActor;

class UserImageScreenActor;

@@ -50,8 +50,8 @@ class OobeDisplay {

SCREEN_USER_IMAGE_PICKER,

SCREEN_TPM_ERROR,

SCREEN_PASSWORD_CHANGED,

- SCREEN_CREATE_MANAGED_USER_DIALOG,

- SCREEN_CREATE_MANAGED_USER_FLOW,

+ SCREEN_CREATE_SUPERVISED_USER_DIALOG,

+ SCREEN_CREATE_SUPERVISED_USER_FLOW,

SCREEN_TERMS_OF_SERVICE,

SCREEN_WRONG_HWID,

SCREEN_AUTO_ENROLLMENT_CHECK,

@@ -82,8 +82,8 @@ class OobeDisplay {

virtual AutoEnrollmentCheckScreenActor*

GetAutoEnrollmentCheckScreenActor() = 0;

virtual HIDDetectionScreenActor* GetHIDDetectionScreenActor() = 0;

- virtual LocallyManagedUserCreationScreenHandler*

- GetLocallyManagedUserCreationScreenActor() = 0;

+ virtual SupervisedUserCreationScreenHandler*

+ GetSupervisedUserCreationScreenActor() = 0;

virtual AppLaunchSplashScreenActor* GetAppLaunchSplashScreenActor() = 0;

virtual ControllerPairingScreenActor* GetControllerPairingScreenActor() = 0;

virtual HostPairingScreenActor* GetHostPairingScreenActor() = 0;