Under the tab-modal signin flow, always show the Confirmation dialog.

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

 // Copyright (c) 2012 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/ui/sync/one_click_signin_sync_starter.h"
 
 #include <stddef.h>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 374 matching lines @@
     else if (start_mode_ == CONFIRM_SYNC_SETTINGS_FIRST)
       start_mode_ = SYNC_WITH_DEFAULT_SETTINGS;
 
     SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
     signin->CompletePendingSignin();
   }
 }
 
 void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed(
     LoginUIService::SyncConfirmationUIClosedResults results) {
+
+  if (switches::UsePasswordSeparatedSigninFlow()) {
+    // We didn't run this callback in AccountAddedToCookie so do it now.
+    if (!sync_setup_completed_callback_.is_null())
+      sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
+  }
+
   switch (results) {
     case LoginUIService::CONFIGURE_SYNC_FIRST:
       content::RecordAction(
           base::UserMetricsAction("Signin_Signin_WithAdvancedSyncSettings"));
       chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
       break;
     case LoginUIService::SYNC_WITH_DEFAULT_SETTINGS: {
       content::RecordAction(
           base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings"));
       ProfileSyncService* profile_sync_service = GetProfileSyncService();
@@ skipping 42 matching lines @@
   signin_metrics::LogSigninReason(
       signin::GetSigninReasonForPromoURL(current_url_));
   content::RecordAction(base::UserMetricsAction("Signin_Signin_Succeed"));
 }
 
 void OneClickSigninSyncStarter::AccountAddedToCookie(
     const GoogleServiceAuthError& error) {
   // Regardless of whether the account was successfully added or not,
   // continue with sync starting.
 
+  if (switches::UsePasswordSeparatedSigninFlow()) {
+    // Under the new signin flow, the sync confirmation dialog should always be
+    // shown regardless of |start_mode_|. |sync_setup_completed_callback_| will
+    // be run after the modal is closed.
+    DisplayModalSyncConfirmationWindow();
+    return;
+  }
+
   if (!sync_setup_completed_callback_.is_null())
     sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
 
   switch (start_mode_) {
     case SYNC_WITH_DEFAULT_SETTINGS: {
       // Just kick off the sync machine, no need to configure it first.
       ProfileSyncService* profile_sync_service = GetProfileSyncService();
       if (profile_sync_service)
         profile_sync_service->SetFirstSetupComplete();
       FinishProfileSyncServiceSetup();
       if (confirmation_required_ == CONFIRM_AFTER_SIGNIN) {
         base::string16 message;
         if (!profile_sync_service) {
           // Sync is disabled by policy.
           message = l10n_util::GetStringUTF16(
               IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE);
         }
         DisplayFinalConfirmationBubble(message);
       }
       break;
     }
     case CONFIRM_SYNC_SETTINGS_FIRST:
-      if (switches::UsePasswordSeparatedSigninFlow()) {
-        DisplayModalSyncConfirmationWindow();
-      } else {
-        // Blocks sync until the sync settings confirmation UI is closed.
-        DisplayFinalConfirmationBubble(base::string16());
-      }
+      // Blocks sync until the sync settings confirmation UI is closed.
+      DisplayFinalConfirmationBubble(base::string16());
       return;
     case CONFIGURE_SYNC_FIRST:
       ShowSettingsPage(true);  // Show sync config UI.
       break;
     case SHOW_SETTINGS_WITHOUT_CONFIGURE:
       ShowSettingsPage(false);  // Don't show sync config UI.
       break;
     case UNDO_SYNC:
       NOTREACHED();
   }
@@ skipping 136 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }