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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index f6fab4e420c412280811131df19fdb2c4780580f..782ad0fcfaacb3b302044f343e1304020fe8f728 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -42,11 +42,7 @@ WebUILoginDisplay::~WebUILoginDisplay() {
// LoginDisplay implementation: ------------------------------------------------
WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
- : LoginDisplay(delegate, gfx::Rect()),
- show_guest_(false),
- show_new_user_(false),
- webui_handler_(NULL) {
-}
+ : LoginDisplay(delegate, gfx::Rect()) {}
void WebUILoginDisplay::ClearAndEnablePassword() {
if (webui_handler_)
@@ -325,10 +321,10 @@ void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
delegate_->ResetPublicSessionAutoLoginTimer();
}
-bool WebUILoginDisplay::IsUserWhitelisted(const std::string& user_id) {
+bool WebUILoginDisplay::IsUserWhitelisted(const AccountId& account_id) {
DCHECK(delegate_);
if (delegate_)
- return delegate_->IsUserWhitelisted(user_id);
+ return delegate_->IsUserWhitelisted(account_id);
return true;
}
« 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