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

Side by Side Diff: chrome/browser/chromeos/login/managed/locally_managed_user_constants.cc

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 (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 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h " 5 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h "
6 6
7 #include "chromeos/cryptohome/cryptohome_parameters.h" 7 #include "chromeos/cryptohome/cryptohome_parameters.h"
8 8
9 namespace chromeos { 9 namespace chromeos {
10 10
11 const char kManagedUserTokenFilename[] = "token"; 11 const char kSupervisedUserTokenFilename[] = "token";
12 12
13 const char kCryptohomeManagedUserKeyLabel[] = "managed"; 13 const char kCryptohomeSupervisedUserKeyLabel[] = "managed";
14 const char kCryptohomeMasterKeyLabel[] = "master"; 14 const char kCryptohomeMasterKeyLabel[] = "master";
15 const char kLegacyCryptohomeManagedUserKeyLabel[] = "default-0"; 15 const char kLegacyCryptohomeSupervisedUserKeyLabel[] = "default-0";
16 const char kLegacyCryptohomeMasterKeyLabel[] = "default-1"; 16 const char kLegacyCryptohomeMasterKeyLabel[] = "default-1";
17 17
18 const int kCryptohomeManagedUserKeyPrivileges = 18 const int kCryptohomeSupervisedUserKeyPrivileges =
19 cryptohome::PRIV_AUTHORIZED_UPDATE | cryptohome::PRIV_MOUNT; 19 cryptohome::PRIV_AUTHORIZED_UPDATE | cryptohome::PRIV_MOUNT;
20 const int kCryptohomeManagedUserIncompleteKeyPrivileges = 20 const int kCryptohomeSupervisedUserIncompleteKeyPrivileges =
21 cryptohome::PRIV_MIGRATE | cryptohome::PRIV_MOUNT; 21 cryptohome::PRIV_MIGRATE | cryptohome::PRIV_MOUNT;
22 22
23 } // namespace chromeos 23 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698