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

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

Issue 369833002: Tests added for user-listing on sign-in screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Delete added. 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 | « no previous file | chrome/browser/chromeos/login/users/fake_user_manager.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 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"
(...skipping 18 matching lines...) Expand all
29 const char kKeyPublicAccount[] = "publicAccount"; 29 const char kKeyPublicAccount[] = "publicAccount";
30 const char kKeyLocallyManagedUser[] = "locallyManagedUser"; 30 const char kKeyLocallyManagedUser[] = "locallyManagedUser";
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 const size_t kMaxUsers = 18; 40 const size_t kMaxUsers = 18;
40 41
41 const int kPasswordClearTimeoutSec = 60; 42 const int kPasswordClearTimeoutSec = 60;
42 43
43 } // namespace 44 } // namespace
44 45
45 UserSelectionScreen::UserSelectionScreen() : handler_(NULL) { 46 UserSelectionScreen::UserSelectionScreen() : handler_(NULL) {
46 } 47 }
47 48
48 UserSelectionScreen::~UserSelectionScreen() { 49 UserSelectionScreen::~UserSelectionScreen() {
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 } 289 }
289 290
290 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType( 291 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
291 const std::string& username) const { 292 const std::string& username) const {
292 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())
293 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD; 294 return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
294 return user_auth_type_map_.find(username)->second; 295 return user_auth_type_map_.find(username)->second;
295 } 296 }
296 297
297 } // namespace chromeos 298 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/fake_user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698