Migrate signin error messages to the new avatar bubble

chrome/browser/ui/webui/signin/login_ui_service.cc

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 ed917088fc84fa2c4fe3e50491fb923041e8144b..159cb74c62d1b4710d9f4950ebb44720c6a7d697 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service.cc
+++ b/chrome/browser/ui/webui/signin/login_ui_service.cc
@@ -8,12 +8,14 @@
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/sync/inline_login_dialog.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
+#include "components/signin/core/common/profile_management_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ -64,3 +66,29 @@ void LoginUIService::ShowLoginPopup() {
   chrome::ShowBrowserSignin(displayer.browser(), signin::SOURCE_APP_LAUNCHER);
 #endif
 }
+
+void LoginUIService::DisplayLoginResult(Browser* browser,
+                                        const base::string16& message) {
+  last_login_result_ = message;
+  if (switches::IsNewAvatarMenu()) {
+    browser->window()->ShowAvatarBubbleFromAvatarButton(
+        message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN :
+                          BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR,
+        signin::ManageAccountsParams());
+  } else {
+#if defined(ENABLE_ONE_CLICK_SIGNIN)
+    browser->window()->ShowOneClickSigninBubble(
+        BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
+        base::string16(), /* no SAML email */
+        message,
+        // This callback is never invoked.
+        // TODO(rogerta): Separate out the bubble API so we don't have to pass
+        // ignored |email| and |callback| params.
+        BrowserWindow::StartSyncCallback());
+#endif
+  }
+}
+
+const base::string16& LoginUIService::GetLastLoginResult() {
+  return last_login_result_;
+}