Make sure the new confirmation bubble is always shown upon signin

chrome/browser/profiles/profile_window.cc

Index: chrome/browser/profiles/profile_window.cc
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index a4d6af273bcad0afdc03decb188ae56d5d6c5568..020a274746a8d73714d21f6f54f37afba91e093c 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -362,22 +362,31 @@ void DisableNewProfileManagementPreview(Profile* profile) {
   UpdateServicesWithNewProfileManagementFlag(profile, false);
 }
 
-BubbleViewMode BubbleViewModeFromAvatarBubbleMode(
-    BrowserWindow::AvatarBubbleMode mode) {
+void BubbleViewModeFromAvatarBubbleMode(
+    BrowserWindow::AvatarBubbleMode mode,
+    BubbleViewMode* bubble_view_mode,
+    TutorialMode* tutorial_mode) {
+  *tutorial_mode = TUTORIAL_MODE_NONE;
   switch (mode) {
     case BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT:
-      return profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
+      *bubble_view_mode = BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
+      return;
     case BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN:
-      return profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
+      *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_SIGNIN;
+      return;
     case BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT:
-      return profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
+      *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
+      return;
     case BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH:
-      return profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH;
-    case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
-      return profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
+      *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_REAUTH;
+      return;
+    case BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN:
+      *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
+      *tutorial_mode = TUTORIAL_MODE_CONFIRM_SIGNIN;
+      return;
+    default:
+      *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
   }
-  NOTREACHED();
-  return profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
 }
 
 }  // namespace profiles