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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_USERS_USER_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 const UserAccountData& account_data) OVERRIDE; 98 const UserAccountData& account_data) OVERRIDE;
99 virtual bool IsCurrentUserOwner() const OVERRIDE; 99 virtual bool IsCurrentUserOwner() const OVERRIDE;
100 virtual bool IsCurrentUserNew() const OVERRIDE; 100 virtual bool IsCurrentUserNew() const OVERRIDE;
101 virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const OVERRIDE; 101 virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const OVERRIDE;
102 virtual bool CanCurrentUserLock() const OVERRIDE; 102 virtual bool CanCurrentUserLock() const OVERRIDE;
103 virtual bool IsUserLoggedIn() const OVERRIDE; 103 virtual bool IsUserLoggedIn() const OVERRIDE;
104 virtual bool IsLoggedInAsRegularUser() const OVERRIDE; 104 virtual bool IsLoggedInAsRegularUser() const OVERRIDE;
105 virtual bool IsLoggedInAsDemoUser() const OVERRIDE; 105 virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
106 virtual bool IsLoggedInAsPublicAccount() const OVERRIDE; 106 virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
107 virtual bool IsLoggedInAsGuest() const OVERRIDE; 107 virtual bool IsLoggedInAsGuest() const OVERRIDE;
108 virtual bool IsLoggedInAsLocallyManagedUser() const OVERRIDE; 108 virtual bool IsLoggedInAsSupervisedUser() const OVERRIDE;
109 virtual bool IsLoggedInAsKioskApp() const OVERRIDE; 109 virtual bool IsLoggedInAsKioskApp() const OVERRIDE;
110 virtual bool IsLoggedInAsStub() const OVERRIDE; 110 virtual bool IsLoggedInAsStub() const OVERRIDE;
111 virtual bool IsSessionStarted() const OVERRIDE; 111 virtual bool IsSessionStarted() const OVERRIDE;
112 virtual bool IsUserNonCryptohomeDataEphemeral( 112 virtual bool IsUserNonCryptohomeDataEphemeral(
113 const std::string& user_id) const OVERRIDE; 113 const std::string& user_id) const OVERRIDE;
114 virtual void AddObserver(UserManager::Observer* obs) OVERRIDE; 114 virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
115 virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE; 115 virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
116 virtual void AddSessionStateObserver( 116 virtual void AddSessionStateObserver(
117 UserManager::UserSessionStateObserver* obs) OVERRIDE; 117 UserManager::UserSessionStateObserver* obs) OVERRIDE;
118 virtual void RemoveSessionStateObserver( 118 virtual void RemoveSessionStateObserver(
119 UserManager::UserSessionStateObserver* obs) OVERRIDE; 119 UserManager::UserSessionStateObserver* obs) OVERRIDE;
120 virtual void NotifyLocalStateChanged() OVERRIDE; 120 virtual void NotifyLocalStateChanged() OVERRIDE;
121 121
122 virtual UserFlow* GetCurrentUserFlow() const OVERRIDE; 122 virtual UserFlow* GetCurrentUserFlow() const OVERRIDE;
123 virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE; 123 virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE;
124 virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE; 124 virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE;
125 virtual void ResetUserFlow(const std::string& user_id) OVERRIDE; 125 virtual void ResetUserFlow(const std::string& user_id) OVERRIDE;
126 virtual bool AreLocallyManagedUsersAllowed() const OVERRIDE; 126 virtual bool AreSupervisedUsersAllowed() const OVERRIDE;
127 127
128 // content::NotificationObserver implementation. 128 // content::NotificationObserver implementation.
129 virtual void Observe(int type, 129 virtual void Observe(int type,
130 const content::NotificationSource& source, 130 const content::NotificationSource& source,
131 const content::NotificationDetails& details) OVERRIDE; 131 const content::NotificationDetails& details) OVERRIDE;
132 132
133 // policy::CloudExternalDataPolicyObserver::Delegate: 133 // policy::CloudExternalDataPolicyObserver::Delegate:
134 virtual void OnExternalDataSet(const std::string& policy, 134 virtual void OnExternalDataSet(const std::string& policy,
135 const std::string& user_id) OVERRIDE; 135 const std::string& user_id) OVERRIDE;
136 virtual void OnExternalDataCleared(const std::string& policy, 136 virtual void OnExternalDataCleared(const std::string& policy,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 // Indicates that a user just logged in as guest. 196 // Indicates that a user just logged in as guest.
197 void GuestUserLoggedIn(); 197 void GuestUserLoggedIn();
198 198
199 // Indicates that a regular user just logged in. 199 // Indicates that a regular user just logged in.
200 void RegularUserLoggedIn(const std::string& user_id); 200 void RegularUserLoggedIn(const std::string& user_id);
201 201
202 // Indicates that a regular user just logged in as ephemeral. 202 // Indicates that a regular user just logged in as ephemeral.
203 void RegularUserLoggedInAsEphemeral(const std::string& user_id); 203 void RegularUserLoggedInAsEphemeral(const std::string& user_id);
204 204
205 // Indicates that a locally managed user just logged in. 205 // Indicates that a supervised user just logged in.
206 void LocallyManagedUserLoggedIn(const std::string& user_id); 206 void SupervisedUserLoggedIn(const std::string& user_id);
207 207
208 // Indicates that a user just logged into a public session. 208 // Indicates that a user just logged into a public session.
209 void PublicAccountUserLoggedIn(User* user); 209 void PublicAccountUserLoggedIn(User* user);
210 210
211 // Indicates that a kiosk app robot just logged in. 211 // Indicates that a kiosk app robot just logged in.
212 void KioskAppLoggedIn(const std::string& app_id); 212 void KioskAppLoggedIn(const std::string& app_id);
213 213
214 // Indicates that the demo account has just logged in. 214 // Indicates that the demo account has just logged in.
215 void DemoAccountLoggedIn(); 215 void DemoAccountLoggedIn();
216 216
(...skipping 13 matching lines...) Expand all
230 230
231 void SetCurrentUserIsOwner(bool is_current_user_owner); 231 void SetCurrentUserIsOwner(bool is_current_user_owner);
232 232
233 // Updates current user ownership on UI thread. 233 // Updates current user ownership on UI thread.
234 void UpdateOwnership(); 234 void UpdateOwnership();
235 235
236 // Removes data stored or cached outside the user's cryptohome (wallpaper, 236 // Removes data stored or cached outside the user's cryptohome (wallpaper,
237 // avatar, OAuth token status, display name, display email). 237 // avatar, OAuth token status, display name, display email).
238 void RemoveNonCryptohomeData(const std::string& user_id); 238 void RemoveNonCryptohomeData(const std::string& user_id);
239 239
240 // Removes a regular or locally managed user from the user list. 240 // Removes a regular or supervised user from the user list.
241 // Returns the user if found or NULL otherwise. 241 // Returns the user if found or NULL otherwise.
242 // Also removes the user from the persistent user list. 242 // Also removes the user from the persistent user list.
243 User* RemoveRegularOrLocallyManagedUserFromList(const std::string& user_id); 243 User* RemoveRegularOrSupervisedUserFromList(const std::string& user_id);
244 244
245 // If data for a public account is marked as pending removal and the user is 245 // If data for a public account is marked as pending removal and the user is
246 // no longer logged into that account, removes the data. 246 // no longer logged into that account, removes the data.
247 void CleanUpPublicAccountNonCryptohomeDataPendingRemoval(); 247 void CleanUpPublicAccountNonCryptohomeDataPendingRemoval();
248 248
249 // Removes data belonging to public accounts that are no longer found on the 249 // Removes data belonging to public accounts that are no longer found on the
250 // user list. If the user is currently logged into one of these accounts, the 250 // user list. If the user is currently logged into one of these accounts, the
251 // data for that account is not removed immediately but marked as pending 251 // data for that account is not removed immediately but marked as pending
252 // removal after logout. 252 // removal after logout.
253 void CleanUpPublicAccountNonCryptohomeData( 253 void CleanUpPublicAccountNonCryptohomeData(
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 // ID of the user just added to the session that needs to be activated 433 // ID of the user just added to the session that needs to be activated
434 // as soon as user's profile is loaded. 434 // as soon as user's profile is loaded.
435 std::string pending_user_switch_; 435 std::string pending_user_switch_;
436 436
437 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl); 437 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
438 }; 438 };
439 439
440 } // namespace chromeos 440 } // namespace chromeos
441 441
442 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_ 442 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_
OLDNEW
« 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