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

Side by Side Diff: chrome/browser/chromeos/login/users/user.h

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 21 matching lines...) Expand all
32 // Regular user, has a user name and password. 32 // Regular user, has a user name and password.
33 USER_TYPE_REGULAR = 0, 33 USER_TYPE_REGULAR = 0,
34 // Guest user, logs in without authentication. 34 // Guest user, logs in without authentication.
35 USER_TYPE_GUEST = 1, 35 USER_TYPE_GUEST = 1,
36 // Retail mode user, logs in without authentication. This is a special user 36 // Retail mode user, logs in without authentication. This is a special user
37 // type used in retail mode only. 37 // type used in retail mode only.
38 USER_TYPE_RETAIL_MODE = 2, 38 USER_TYPE_RETAIL_MODE = 2,
39 // Public account user, logs in without authentication. Available only if 39 // Public account user, logs in without authentication. Available only if
40 // enabled through policy. 40 // enabled through policy.
41 USER_TYPE_PUBLIC_ACCOUNT = 3, 41 USER_TYPE_PUBLIC_ACCOUNT = 3,
42 // Locally managed user, logs in only with local authentication. 42 // Supervised (aka locally managed) user, logs in only with local
43 // authentication.
43 USER_TYPE_LOCALLY_MANAGED = 4, 44 USER_TYPE_LOCALLY_MANAGED = 4,
44 // Kiosk app robot, logs in without authentication. 45 // Kiosk app robot, logs in without authentication.
45 USER_TYPE_KIOSK_APP = 5, 46 USER_TYPE_KIOSK_APP = 5,
46 // Maximum histogram value. 47 // Maximum histogram value.
47 NUM_USER_TYPES = 6 48 NUM_USER_TYPES = 6
48 } UserType; 49 } UserType;
49 50
50 // User OAuth token status according to the last check. 51 // User OAuth token status according to the last check.
51 // Please note that enum values 1 and 2 were used for OAuth1 status and are 52 // Please note that enum values 1 and 2 were used for OAuth1 status and are
52 // deprecated now. 53 // deprecated now.
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 278
278 DISALLOW_COPY_AND_ASSIGN(User); 279 DISALLOW_COPY_AND_ASSIGN(User);
279 }; 280 };
280 281
281 // List of known users. 282 // List of known users.
282 typedef std::vector<User*> UserList; 283 typedef std::vector<User*> UserList;
283 284
284 } // namespace chromeos 285 } // namespace chromeos
285 286
286 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_ 287 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698