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

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

Issue 1058433002: [cros login, new GAIA] New UI for not authorized error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bring back changes Created 5 years, 8 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 void WebUILoginDisplay::ShowPasswordChangedDialog(bool show_password_error) { 185 void WebUILoginDisplay::ShowPasswordChangedDialog(bool show_password_error) {
186 if (webui_handler_) 186 if (webui_handler_)
187 webui_handler_->ShowPasswordChangedDialog(show_password_error); 187 webui_handler_->ShowPasswordChangedDialog(show_password_error);
188 } 188 }
189 189
190 void WebUILoginDisplay::ShowSigninUI(const std::string& email) { 190 void WebUILoginDisplay::ShowSigninUI(const std::string& email) {
191 if (webui_handler_) 191 if (webui_handler_)
192 webui_handler_->ShowSigninUI(email); 192 webui_handler_->ShowSigninUI(email);
193 } 193 }
194 194
195 void WebUILoginDisplay::ShowWhitelistCheckFailedError() {
196 if (webui_handler_)
197 webui_handler_->ShowWhitelistCheckFailedError();
198 }
199
195 // WebUILoginDisplay, NativeWindowDelegate implementation: --------------------- 200 // WebUILoginDisplay, NativeWindowDelegate implementation: ---------------------
196 gfx::NativeWindow WebUILoginDisplay::GetNativeWindow() const { 201 gfx::NativeWindow WebUILoginDisplay::GetNativeWindow() const {
197 return parent_window(); 202 return parent_window();
198 } 203 }
199 204
200 // WebUILoginDisplay, SigninScreenHandlerDelegate implementation: -------------- 205 // WebUILoginDisplay, SigninScreenHandlerDelegate implementation: --------------
201 void WebUILoginDisplay::CancelPasswordChangedFlow() { 206 void WebUILoginDisplay::CancelPasswordChangedFlow() {
202 DCHECK(delegate_); 207 DCHECK(delegate_);
203 if (delegate_) 208 if (delegate_)
204 delegate_->CancelPasswordChangedFlow(); 209 delegate_->CancelPasswordChangedFlow();
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 delegate_->Signout(); 331 delegate_->Signout();
327 } 332 }
328 333
329 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) { 334 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
330 if (delegate_) 335 if (delegate_)
331 delegate_->ResetPublicSessionAutoLoginTimer(); 336 delegate_->ResetPublicSessionAutoLoginTimer();
332 } 337 }
333 338
334 339
335 } // namespace chromeos 340 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698