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

Unified Diff: chrome/browser/chromeos/login/users/user_manager_impl.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/users/user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/users/user_manager_impl.h b/chrome/browser/chromeos/login/users/user_manager_impl.h
index f4ea86788608fd0a9cb3d41282a97861700ddae1..738f87cb99adbd62234c8139521fb58a77dd3217 100644
--- a/chrome/browser/chromeos/login/users/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/users/user_manager_impl.h
@@ -105,7 +105,7 @@ class UserManagerImpl
virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
virtual bool IsLoggedInAsGuest() const OVERRIDE;
- virtual bool IsLoggedInAsLocallyManagedUser() const OVERRIDE;
+ virtual bool IsLoggedInAsSupervisedUser() const OVERRIDE;
virtual bool IsLoggedInAsKioskApp() const OVERRIDE;
virtual bool IsLoggedInAsStub() const OVERRIDE;
virtual bool IsSessionStarted() const OVERRIDE;
@@ -123,7 +123,7 @@ class UserManagerImpl
virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE;
virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE;
virtual void ResetUserFlow(const std::string& user_id) OVERRIDE;
- virtual bool AreLocallyManagedUsersAllowed() const OVERRIDE;
+ virtual bool AreSupervisedUsersAllowed() const OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
@@ -202,8 +202,8 @@ class UserManagerImpl
// Indicates that a regular user just logged in as ephemeral.
void RegularUserLoggedInAsEphemeral(const std::string& user_id);
- // Indicates that a locally managed user just logged in.
- void LocallyManagedUserLoggedIn(const std::string& user_id);
+ // Indicates that a supervised user just logged in.
+ void SupervisedUserLoggedIn(const std::string& user_id);
// Indicates that a user just logged into a public session.
void PublicAccountUserLoggedIn(User* user);
@@ -237,10 +237,10 @@ class UserManagerImpl
// avatar, OAuth token status, display name, display email).
void RemoveNonCryptohomeData(const std::string& user_id);
- // Removes a regular or locally managed user from the user list.
+ // Removes a regular or supervised user from the user list.
// Returns the user if found or NULL otherwise.
// Also removes the user from the persistent user list.
- User* RemoveRegularOrLocallyManagedUserFromList(const std::string& user_id);
+ User* RemoveRegularOrSupervisedUserFromList(const std::string& user_id);
// If data for a public account is marked as pending removal and the user is
// no longer logged into that account, removes the data.
« no previous file with comments | « chrome/browser/chromeos/login/users/user_manager.h ('k') | chrome/browser/chromeos/login/users/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698