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

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: fix2 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
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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
12 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 12 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
13 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 13 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
14 #include "chrome/browser/signin/screenlock_bridge.h" 14 #include "chrome/browser/signin/screenlock_bridge.h"
15 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 15 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
16 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
17 #include "components/user_manager/user_type.h" 17 #include "components/user_manager/user_type.h"
18 #include "ui/wm/core/user_activity_detector.h" 18 #include "ui/wm/core/user_activity_detector.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 namespace { 22 namespace {
23 23
24 // User dictionary keys. 24 // User dictionary keys.
25 const char kKeyUsername[] = "username"; 25 const char kKeyUsername[] = "username";
26 const char kKeyDisplayName[] = "displayName"; 26 const char kKeyDisplayName[] = "displayName";
27 const char kKeyEmailAddress[] = "emailAddress"; 27 const char kKeyEmailAddress[] = "emailAddress";
28 const char kKeyEnterpriseDomain[] = "enterpriseDomain"; 28 const char kKeyEnterpriseDomain[] = "enterpriseDomain";
29 const char kKeyPublicAccount[] = "publicAccount"; 29 const char kKeyPublicAccount[] = "publicAccount";
30 const char kKeySupervisedUser[] = "locallyManagedUser"; 30 const char kKeySupervisedUser[] = "supervisedUser";
31 const char kKeySignedIn[] = "signedIn"; 31 const char kKeySignedIn[] = "signedIn";
32 const char kKeyCanRemove[] = "canRemove"; 32 const char kKeyCanRemove[] = "canRemove";
33 const char kKeyIsOwner[] = "isOwner"; 33 const char kKeyIsOwner[] = "isOwner";
34 const char kKeyInitialAuthType[] = "initialAuthType"; 34 const char kKeyInitialAuthType[] = "initialAuthType";
35 const char kKeyMultiProfilesAllowed[] = "isMultiProfilesAllowed"; 35 const char kKeyMultiProfilesAllowed[] = "isMultiProfilesAllowed";
36 const char kKeyMultiProfilesPolicy[] = "multiProfilesPolicy"; 36 const char kKeyMultiProfilesPolicy[] = "multiProfilesPolicy";
37 37
38 // Max number of users to show. 38 // Max number of users to show.
39 // Please keep synced with one in signin_userlist_unittest.cc. 39 // Please keep synced with one in signin_userlist_unittest.cc.
40 const size_t kMaxUsers = 18; 40 const size_t kMaxUsers = 18;
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 } 289 }
290 290
291 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType( 291 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
292 const std::string& username) const { 292 const std::string& username) const {
293 if (user_auth_type_map_.find(username) == user_auth_type_map_.end()) 293 if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
294 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; 294 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
295 return user_auth_type_map_.find(username)->second; 295 return user_auth_type_map_.find(username)->second;
296 } 296 }
297 297
298 } // namespace chromeos 298 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698