| OLD | NEW |
| 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 Loading... |
| 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 | 315 |
| 320 void WebUILoginDisplay::Signout() { | 316 void WebUILoginDisplay::Signout() { |
| 321 delegate_->Signout(); | 317 delegate_->Signout(); |
| 322 } | 318 } |
| 323 | 319 |
| 324 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { | 320 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { |
| 325 if (delegate_) | 321 if (delegate_) |
| 326 delegate_->ResetPublicSessionAutoLoginTimer(); | 322 delegate_->ResetPublicSessionAutoLoginTimer(); |
| 327 } | 323 } |
| 328 | 324 |
| 329 bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) { | 325 bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) { |
| 330 DCHECK(delegate_); | 326 DCHECK(delegate_); |
| 331 if (delegate_) | 327 if (delegate_) |
| 332 return delegate_->IsUserWhitelisted(user_id); | 328 return delegate_->IsUserWhitelisted(account_id); |
| 333 return true; | 329 return true; |
| 334 } | 330 } |
| 335 | 331 |
| 336 } // namespace chromeos | 332 } // namespace chromeos |
| OLD | NEW |