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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 12 matching lines...) Expand all
23 namespace chromeos { 23 namespace chromeos {
24 24
25 namespace { 25 namespace {
26 26
27 // User dictionary keys. 27 // User dictionary keys.
28 const char kKeyUsername[] = "username"; 28 const char kKeyUsername[] = "username";
29 const char kKeyDisplayName[] = "displayName"; 29 const char kKeyDisplayName[] = "displayName";
30 const char kKeyEmailAddress[] = "emailAddress"; 30 const char kKeyEmailAddress[] = "emailAddress";
31 const char kKeyEnterpriseDomain[] = "enterpriseDomain"; 31 const char kKeyEnterpriseDomain[] = "enterpriseDomain";
32 const char kKeyPublicAccount[] = "publicAccount"; 32 const char kKeyPublicAccount[] = "publicAccount";
33 const char kKeySupervisedUser[] = "locallyManagedUser"; 33 const char kKeySupervisedUser[] = "supervisedUser";
34 const char kKeySignedIn[] = "signedIn"; 34 const char kKeySignedIn[] = "signedIn";
35 const char kKeyCanRemove[] = "canRemove"; 35 const char kKeyCanRemove[] = "canRemove";
36 const char kKeyIsOwner[] = "isOwner"; 36 const char kKeyIsOwner[] = "isOwner";
37 const char kKeyInitialAuthType[] = "initialAuthType"; 37 const char kKeyInitialAuthType[] = "initialAuthType";
38 const char kKeyMultiProfilesAllowed[] = "isMultiProfilesAllowed"; 38 const char kKeyMultiProfilesAllowed[] = "isMultiProfilesAllowed";
39 const char kKeyMultiProfilesPolicy[] = "multiProfilesPolicy"; 39 const char kKeyMultiProfilesPolicy[] = "multiProfilesPolicy";
40 const char kKeyInitialLocales[] = "initialLocales"; 40 const char kKeyInitialLocales[] = "initialLocales";
41 const char kKeyInitialKeyboardLayouts[] = "initialKeyboardLayouts"; 41 const char kKeyInitialKeyboardLayouts[] = "initialKeyboardLayouts";
42 42
43 // Max number of users to show. 43 // Max number of users to show.
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 } 308 }
309 309
310 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType( 310 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
311 const std::string& username) const { 311 const std::string& username) const {
312 if (user_auth_type_map_.find(username) == user_auth_type_map_.end()) 312 if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
313 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; 313 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
314 return user_auth_type_map_.find(username)->second; 314 return user_auth_type_map_.find(username)->second;
315 } 315 }
316 316
317 } // namespace chromeos 317 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698