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; |
} |