Chromium Code Reviews| 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..95bd2a3662b801dc157efb986c93121c48cb6332 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::SetLastLoginErrorEmail(const base::string16& email) { |
| + last_login_error_email_ = email; |
| +} |
| + |
| 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(); |
|
tommycli
2016/08/23 19:15:39
Knowing little about signin, this confuses me. It
Jane
2016/08/24 13:40:31
Done. You are right, this is confusing. Somewhere
|
| + } 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::GetLastLoginErrorEmail() { |
| + return last_login_error_email_; |
| +} |