Make sure the new confirmation bubble is always shown upon signin

chrome/browser/profiles/profile_window.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 332 matching lines @@
   about_flags::PrefServiceFlagsStorage flags_storage(
       g_browser_process->local_state());
   about_flags::SetExperimentEnabled(
       &flags_storage,
       kNewProfileManagementExperimentInternalName,
       false);
   chrome::AttemptRestart();
   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