chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.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/supervised/supervised_user_creation_flow.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_creation_controller_new.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h

diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h

similarity index 72%

rename from chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h

rename to chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h

index f99072516f1c77df2fa906db89e5b0adae59db0a..02e5d8b7e921ee025163fa35904d7374bd99bf80 100644

--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_flow.h

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CREATION_FLOW_H_

-#define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CREATION_FLOW_H_

+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_FLOW_H_

+#define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_FLOW_H_

#include "base/basictypes.h"

#include "base/compiler_specific.h"

@@ -15,11 +15,11 @@ class Profile;

namespace chromeos {

-// UserFlow implementation for creating new locally managed user.

-class LocallyManagedUserCreationFlow : public ExtendedUserFlow {

+// UserFlow implementation for creating new supervised user.

+class SupervisedUserCreationFlow : public ExtendedUserFlow {

public:

- explicit LocallyManagedUserCreationFlow(const std::string& manager_id);

- virtual ~LocallyManagedUserCreationFlow();

+ explicit SupervisedUserCreationFlow(const std::string& manager_id);

+ virtual ~SupervisedUserCreationFlow();

virtual bool CanLockScreen() OVERRIDE;

virtual bool ShouldShowSettings() OVERRIDE;

@@ -50,9 +50,9 @@ class LocallyManagedUserCreationFlow : public ExtendedUserFlow {

Profile* manager_profile_;

- DISALLOW_COPY_AND_ASSIGN(LocallyManagedUserCreationFlow);

+ DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationFlow);

};

} // namespace chromeos

-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CREATION_FLOW_H_

+#endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_FLOW_H_