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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 2811383002: cros: Refactor oobe LoadUsers to include non-serialized user list. (Closed)
Patch Set: Initial upload Created 3 years, 7 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
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/ui/webui_login_display.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
6 6
7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
8 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 8 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h" 9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
10 #include "chrome/browser/chromeos/login/signin_screen_controller.h" 10 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 if (webui_handler_) 48 if (webui_handler_)
49 webui_handler_->ClearAndEnablePassword(); 49 webui_handler_->ClearAndEnablePassword();
50 } 50 }
51 51
52 void WebUILoginDisplay::Init(const user_manager::UserList& users, 52 void WebUILoginDisplay::Init(const user_manager::UserList& users,
53 bool show_guest, 53 bool show_guest,
54 bool show_users, 54 bool show_users,
55 bool allow_new_user) { 55 bool allow_new_user) {
56 // Testing that the delegate has been set. 56 // Testing that the delegate has been set.
57 DCHECK(delegate_); 57 DCHECK(delegate_);
58 SignInScreenController::Get()->Init(users, show_guest); 58 SignInScreenController::Get()->Init(users);
59 show_guest_ = show_guest; 59 show_guest_ = show_guest;
60 show_users_changed_ = (show_users_ != show_users); 60 show_users_changed_ = (show_users_ != show_users);
61 show_users_ = show_users; 61 show_users_ = show_users;
62 allow_new_user_changed_ = (allow_new_user_ != allow_new_user); 62 allow_new_user_changed_ = (allow_new_user_ != allow_new_user);
63 allow_new_user_ = allow_new_user; 63 allow_new_user_ = allow_new_user;
64 64
65 ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get(); 65 ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
66 if (activity_detector && !activity_detector->HasObserver(this)) 66 if (activity_detector && !activity_detector->HasObserver(this))
67 activity_detector->AddObserver(this); 67 activity_detector->AddObserver(this);
68 } 68 }
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 } 344 }
345 345
346 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) { 346 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) {
347 DCHECK(delegate_); 347 DCHECK(delegate_);
348 if (delegate_) 348 if (delegate_)
349 return delegate_->IsUserWhitelisted(account_id); 349 return delegate_->IsUserWhitelisted(account_id);
350 return true; 350 return true;
351 } 351 }
352 352
353 } // namespace chromeos 353 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698