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

Side by Side Diff: chromeos/login/user_names.cc

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
« no previous file with comments | « chromeos/login/user_names.h ('k') | components/user_manager/user_type.h » ('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 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 #include "chromeos/login/user_names.h" 4 #include "chromeos/login/user_names.h"
5 5
6 #include "google_apis/gaia/gaia_auth_util.h" 6 #include "google_apis/gaia/gaia_auth_util.h"
7 7
8 namespace chromeos { 8 namespace chromeos {
9 9
10 namespace login { 10 namespace login {
11 11
12 const char* kStubUser = "stub-user@example.com"; 12 const char* kStubUser = "stub-user@example.com";
13 13
14 const char* kSignInUser = "sign-in-user-id"; 14 const char* kSignInUser = "sign-in-user-id";
15 15
16 // Should match cros constant in platform/libchromeos/chromeos/cryptohome.h 16 // Should match cros constant in platform/libchromeos/chromeos/cryptohome.h
17 const char* kGuestUserName = "$guest"; 17 const char* kGuestUserName = "$guest";
18 18
19 const char* kLocallyManagedUserDomain = "locally-managed.localhost"; 19 const char* kSupervisedUserDomain = "locally-managed.localhost";
20 20
21 const char* kRetailModeUserName = "demouser@"; 21 const char* kRetailModeUserName = "demouser@";
22 22
23 std::string CanonicalizeUserID(const std::string& user_id) { 23 std::string CanonicalizeUserID(const std::string& user_id) {
24 if (user_id == chromeos::login::kGuestUserName) 24 if (user_id == chromeos::login::kGuestUserName)
25 return user_id; 25 return user_id;
26 return gaia::CanonicalizeEmail(user_id); 26 return gaia::CanonicalizeEmail(user_id);
27 } 27 }
28 28
29 } // namespace login 29 } // namespace login
30 30
31 } // namespace chromeos 31 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/login/user_names.h ('k') | components/user_manager/user_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698