Implement the new Sync Confirmation dialog on Linux and Windows.

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index 95249615243d283142499e5a8a4575ba29326616..bb8327b3ebd98314f3da8d794725c6f56733794c 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -41,6 +41,7 @@
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_metrics.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/user_metrics.h"
 #include "net/base/url_util.h"
@@ -409,18 +410,24 @@ void OneClickSigninSyncStarter::UntrustedSigninConfirmed(
 }
 
 void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed(
-    bool configure_sync_first) {
-  if (configure_sync_first) {
-    content::RecordAction(
-        base::UserMetricsAction("Signin_Signin_WithAdvancedSyncSettings"));
-    chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
-  } else {
-    content::RecordAction(
-        base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings"));
-    ProfileSyncService* profile_sync_service = GetProfileSyncService();
-    if (profile_sync_service)
-      profile_sync_service->SetSyncSetupCompleted();
-    FinishProfileSyncServiceSetup();
+    LoginUIService::SyncConfirmationUIClosedResults results) {
+  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();
+      if (profile_sync_service)
+        profile_sync_service->SetSyncSetupCompleted();
+      FinishProfileSyncServiceSetup();
+      break;
+    }
+    case LoginUIService::ABORT_SIGNIN:
+      break;
   }
 
   delete this;
@@ -487,8 +494,12 @@ void OneClickSigninSyncStarter::AccountAddedToCookie(
       break;
     }
     case CONFIRM_SYNC_SETTINGS_FIRST:
-      // Blocks sync until the sync settings confirmation UI is closed.
-      DisplayFinalConfirmationBubble(base::string16());
+      if (switches::UsePasswordSeparatedSigninFlow()) {
+        DisplayModalSyncConfirmationWindow();
+      } else {
+        // Blocks sync until the sync settings confirmation UI is closed.
+        DisplayFinalConfirmationBubble(base::string16());
+      }
       return;
     case CONFIGURE_SYNC_FIRST:
       ShowSettingsPage(true);  // Show sync config UI.
@@ -517,6 +528,11 @@ void OneClickSigninSyncStarter::DisplayFinalConfirmationBubble(
       DisplayLoginResult(browser_, custom_message);
 }
 
+void OneClickSigninSyncStarter::DisplayModalSyncConfirmationWindow() {
+  browser_ = EnsureBrowser(browser_, profile_, desktop_type_);
+  browser_->window()->ShowModalSyncConfirmationWindow();
+}
+
 // static
 Browser* OneClickSigninSyncStarter::EnsureBrowser(
     Browser* browser,