Enhanced Sync Confirmation modal

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

 // Copyright 2015 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/webui/signin/sync_confirmation_handler.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 17 matching lines @@
       base::Bind(&SyncConfirmationHandler::HandleUndo, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("initialized",
       base::Bind(&SyncConfirmationHandler::HandleInitialized,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("goToSettings",
       base::Bind(&SyncConfirmationHandler::HandleGoToSettings,
                  base::Unretained(this)));
 }
 
 void SyncConfirmationHandler::HandleConfirm(const base::ListValue* args) {
-  CloseModalSigninWindow(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
+  bool open_activity_controls = false;
+  bool success = args->GetBoolean(0, &open_activity_controls);
+  DCHECK(success);
+  LoginUIService::SyncConfirmationUIClosedResults results =
+      open_activity_controls ? LoginUIService::SYNC_WITH_ACTIVITY_CONTROLS:
+                               LoginUIService::SYNC_WITH_DEFAULT_SETTINGS;
+  CloseModalSigninWindow(results);
 }
 
 void SyncConfirmationHandler::HandleGoToSettings(const base::ListValue* args) {
   CloseModalSigninWindow(LoginUIService::CONFIGURE_SYNC_FIRST);
 }
 
 void SyncConfirmationHandler::HandleUndo(const base::ListValue* args) {
   content::RecordAction(base::UserMetricsAction("Signin_Undo_Signin"));
   Browser* browser = GetDesktopBrowser();
   LoginUIServiceFactory::GetForProfile(browser->profile())->
@@ skipping 49 matching lines @@
   return browser;
 }
 
 void SyncConfirmationHandler::CloseModalSigninWindow(
     LoginUIService::SyncConfirmationUIClosedResults results) {
   Browser* browser = GetDesktopBrowser();
   LoginUIServiceFactory::GetForProfile(browser->profile())->
       SyncConfirmationUIClosed(results);
   browser->CloseModalSigninWindow();
 }