Index: chrome/browser/ui/webui/signin/login_ui_service.cc |
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc |
index cb4a81aa046a405aaf0b85dc5a8d481ce49b9335..7ea28d896730cd22173573b661341f04ef135bba 100644 |
--- a/chrome/browser/ui/webui/signin/login_ui_service.cc |
+++ b/chrome/browser/ui/webui/signin/login_ui_service.cc |
@@ -65,6 +65,10 @@ void LoginUIService::ShowLoginPopup() { |
#endif |
} |
+void LoginUIService::SetLastLoginErrorUsername(const base::string16& username) { |
+ last_login_error_username_ = username; |
+} |
+ |
void LoginUIService::DisplayLoginResult(Browser* browser, |
const base::string16& message) { |
#if defined(OS_CHROMEOS) |
@@ -72,13 +76,21 @@ void LoginUIService::DisplayLoginResult(Browser* browser, |
NOTREACHED(); |
#endif |
last_login_result_ = message; |
- browser->window()->ShowAvatarBubbleFromAvatarButton( |
- message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN |
- : BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR, |
- signin::ManageAccountsParams(), |
- signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS); |
+ if (switches::IsMaterialDesignUserMenu() && !message.empty()) { |
+ browser->ShowModalSigninErrorWindow(); |
+ } else { |
+ browser->window()->ShowAvatarBubbleFromAvatarButton( |
+ message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN |
+ : BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR, |
+ signin::ManageAccountsParams(), |
+ signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS); |
+ } |
} |
const base::string16& LoginUIService::GetLastLoginResult() { |
return last_login_result_; |
} |
+ |
+const base::string16& LoginUIService::GetLastLoginErrorUsername() { |
+ return last_login_error_username_; |
+} |