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

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

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bugfix in original easy unlock code' Created 5 years 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 24 matching lines...) Expand all
35 if (webui_handler_) 35 if (webui_handler_)
36 webui_handler_->ResetSigninScreenHandlerDelegate(); 36 webui_handler_->ResetSigninScreenHandlerDelegate();
37 ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get(); 37 ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
38 if (activity_detector->HasObserver(this)) 38 if (activity_detector->HasObserver(this))
39 activity_detector->RemoveObserver(this); 39 activity_detector->RemoveObserver(this);
40 } 40 }
41 41
42 // LoginDisplay implementation: ------------------------------------------------ 42 // LoginDisplay implementation: ------------------------------------------------
43 43
44 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate) 44 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
45 : LoginDisplay(delegate, gfx::Rect()), 45 : LoginDisplay(delegate, gfx::Rect()) {}
46 show_guest_(false),
47 show_new_user_(false),
48 webui_handler_(NULL) {
49 }
50 46
51 void WebUILoginDisplay::ClearAndEnablePassword() { 47 void WebUILoginDisplay::ClearAndEnablePassword() {
52 if (webui_handler_) 48 if (webui_handler_)
53 webui_handler_->ClearAndEnablePassword(); 49 webui_handler_->ClearAndEnablePassword();
54 } 50 }
55 51
56 void WebUILoginDisplay::Init(const user_manager::UserList& users, 52 void WebUILoginDisplay::Init(const user_manager::UserList& users,
57 bool show_guest, 53 bool show_guest,
58 bool show_users, 54 bool show_users,
59 bool show_new_user) { 55 bool show_new_user) {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 314
319 void WebUILoginDisplay::Signout() { 315 void WebUILoginDisplay::Signout() {
320 delegate_->Signout(); 316 delegate_->Signout();
321 } 317 }
322 318
323 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { 319 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
324 if (delegate_) 320 if (delegate_)
325 delegate_->ResetPublicSessionAutoLoginTimer(); 321 delegate_->ResetPublicSessionAutoLoginTimer();
326 } 322 }
327 323
328 bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) { 324 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) {
329 DCHECK(delegate_); 325 DCHECK(delegate_);
330 if (delegate_) 326 if (delegate_)
331 return delegate_->IsUserWhitelisted(user_id); 327 return delegate_->IsUserWhitelisted(account_id);
332 return true; 328 return true;
333 } 329 }
334 330
335 } // namespace chromeos 331 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_display.h ('k') | chrome/browser/chromeos/login/user_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698