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

Unified Diff: chrome/browser/ui/webui/signin/login_ui_service.cc

Issue 2255413002: [Signin Error Dialog] (3/3) Added the triggering code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleared up Get/SetLastLoginErrorEmail Created 4 years, 4 months 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
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_;
+}

Powered by Google App Engine
This is Rietveld 408576698