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

Side by Side Diff: chrome/browser/chromeos/login/users/user.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_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 // For testing: 142 // For testing:
143 friend class MockUserManager; 143 friend class MockUserManager;
144 friend class FakeLoginUtils; 144 friend class FakeLoginUtils;
145 friend class FakeUserManager; 145 friend class FakeUserManager;
146 friend class UserAddingScreenTest; 146 friend class UserAddingScreenTest;
147 147
148 // Do not allow anyone else to create new User instances. 148 // Do not allow anyone else to create new User instances.
149 static User* CreateRegularUser(const std::string& email); 149 static User* CreateRegularUser(const std::string& email);
150 static User* CreateGuestUser(); 150 static User* CreateGuestUser();
151 static User* CreateKioskAppUser(const std::string& kiosk_app_username); 151 static User* CreateKioskAppUser(const std::string& kiosk_app_username);
152 static User* CreateLocallyManagedUser(const std::string& username); 152 static User* CreateSupervisedUser(const std::string& username);
153 static User* CreateRetailModeUser(); 153 static User* CreateRetailModeUser();
154 static User* CreatePublicAccountUser(const std::string& email); 154 static User* CreatePublicAccountUser(const std::string& email);
155 155
156 explicit User(const std::string& email); 156 explicit User(const std::string& email);
157 virtual ~User(); 157 virtual ~User();
158 158
159 const std::string* GetAccountLocale() const { 159 const std::string* GetAccountLocale() const {
160 return account_locale_.get(); 160 return account_locale_.get();
161 } 161 }
162 162
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 260
261 DISALLOW_COPY_AND_ASSIGN(User); 261 DISALLOW_COPY_AND_ASSIGN(User);
262 }; 262 };
263 263
264 // List of known users. 264 // List of known users.
265 typedef std::vector<User*> UserList; 265 typedef std::vector<User*> UserList;
266 266
267 } // namespace chromeos 267 } // namespace chromeos
268 268
269 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_ 269 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc ('k') | chrome/browser/chromeos/login/users/user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698