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

Side by Side Diff: chrome/browser/chromeos/login/managed/locally_managed_user_constants.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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/managed/locally_managed_user_constants.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MANAGED_LOCALLY_MANAGED_USER_CONSTANTS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CONSTANTS_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CONSTANTS_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CONSTANTS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 namespace chromeos { 10 namespace chromeos {
11 11
12 extern const char kManagedUserTokenFilename[]; 12 extern const char kSupervisedUserTokenFilename[];
13 13
14 extern const char kCryptohomeManagedUserKeyLabel[]; 14 extern const char kCryptohomeSupervisedUserKeyLabel[];
15 extern const char kCryptohomeMasterKeyLabel[]; 15 extern const char kCryptohomeMasterKeyLabel[];
16 extern const char kLegacyCryptohomeManagedUserKeyLabel[]; 16 extern const char kLegacyCryptohomeSupervisedUserKeyLabel[];
17 extern const char kLegacyCryptohomeMasterKeyLabel[]; 17 extern const char kLegacyCryptohomeMasterKeyLabel[];
18 18
19 // Set of privileges for usual Managed User : Mount and UpdatePrivileged 19 // Set of privileges for usual Supervised User : Mount and UpdatePrivileged
20 // (update with signed key). 20 // (update with signed key).
21 extern const int kCryptohomeManagedUserKeyPrivileges; 21 extern const int kCryptohomeSupervisedUserKeyPrivileges;
22 22
23 // Set of privileges for corner case when pre-M35 managed user got new password. 23 // Set of privileges for corner case when pre-M35 managed user got new password.
24 // As we don't have signature yet, Migrate is used instead of UpdatePrivileged. 24 // As we don't have signature yet, Migrate is used instead of UpdatePrivileged.
25 // Privileges are reset to kCryptohomeManagedUserKeyPrivileges as soon as 25 // Privileges are reset to kCryptohomeSupervisedUserKeyPrivileges as soon as
26 // manager signs in on the machine. 26 // manager signs in on the machine.
27 extern const int kCryptohomeManagedUserIncompleteKeyPrivileges; 27 extern const int kCryptohomeSupervisedUserIncompleteKeyPrivileges;
28 28
29 } // namespace chromeos 29 } // namespace chromeos
30 30
31 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CONSTANTS_ H_ 31 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CONSTANTS_ H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/managed/locally_managed_user_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698