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

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

Issue 1454153002: Revert of This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 71
72 // ---- Common methods 72 // ---- Common methods
73 73
74 // ---- User selection screen methods 74 // ---- User selection screen methods
75 75
76 void WebUILoginDisplay::HandleGetUsers() { 76 void WebUILoginDisplay::HandleGetUsers() {
77 SignInScreenController::Get()->SendUserList(); 77 SignInScreenController::Get()->SendUserList();
78 } 78 }
79 79
80 void WebUILoginDisplay::CheckUserStatus(const AccountId& account_id) { 80 void WebUILoginDisplay::CheckUserStatus(const std::string& user_id) {
81 SignInScreenController::Get()->CheckUserStatus(account_id); 81 SignInScreenController::Get()->CheckUserStatus(user_id);
82 } 82 }
83 83
84 // ---- Gaia screen methods 84 // ---- Gaia screen methods
85 85
86 // ---- Not yet classified methods 86 // ---- Not yet classified methods
87 87
88 void WebUILoginDisplay::OnPreferencesChanged() { 88 void WebUILoginDisplay::OnPreferencesChanged() {
89 if (webui_handler_) 89 if (webui_handler_)
90 webui_handler_->OnPreferencesChanged(); 90 webui_handler_->OnPreferencesChanged();
91 } 91 }
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 } 327 }
328 328
329 bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) { 329 bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) {
330 DCHECK(delegate_); 330 DCHECK(delegate_);
331 if (delegate_) 331 if (delegate_)
332 return delegate_->IsUserWhitelisted(user_id); 332 return delegate_->IsUserWhitelisted(user_id);
333 return true; 333 return true;
334 } 334 }
335 335
336 } // namespace chromeos 336 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698