Enhanced Sync Confirmation modal

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

Index: chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
index df51a0d195a06e803804e9a1cb407d2a7358a3e3..eed3b28b70d9466c083eb92a633de63d4efe60be 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
@@ -4,6 +4,8 @@
 
 #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"
@@ -41,11 +43,25 @@ void SyncConfirmationHandler::RegisterMessages() {
 }
 
 void SyncConfirmationHandler::HandleConfirm(const base::ListValue* args) {
-  CloseModalSigninWindow(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
+  bool open_activity_controls_url = false;
+  bool success = args->GetBoolean(0, &open_activity_controls_url);
+  DCHECK(success);
+  LoginUIService::SyncConfirmationUIClosedResult result =
+      open_activity_controls_url ?
+          LoginUIService::DEFAULT_SETTINGS_OPEN_ACTIVITY_CONTROLS_URL :
+          LoginUIService::SYNC_WITH_DEFAULT_SETTINGS;
+  CloseModalSigninWindow(result);
 }
 
 void SyncConfirmationHandler::HandleGoToSettings(const base::ListValue* args) {
-  CloseModalSigninWindow(LoginUIService::CONFIGURE_SYNC_FIRST);
+  bool open_activity_controls_url = false;
+  bool success = args->GetBoolean(0, &open_activity_controls_url);
+  DCHECK(success);
+  LoginUIService::SyncConfirmationUIClosedResult result =
+      open_activity_controls_url ?
+          LoginUIService::CONFIGURE_FIRST_OPEN_ACTIVITY_CONTROLS_URL :
+          LoginUIService::CONFIGURE_SYNC_FIRST;
+  CloseModalSigninWindow(result);
 }
 
 void SyncConfirmationHandler::HandleUndo(const base::ListValue* args) {
@@ -105,9 +121,9 @@ Browser* SyncConfirmationHandler::GetDesktopBrowser() {
 }
 
 void SyncConfirmationHandler::CloseModalSigninWindow(
-    LoginUIService::SyncConfirmationUIClosedResults results) {
+    LoginUIService::SyncConfirmationUIClosedResult result) {
   Browser* browser = GetDesktopBrowser();
   LoginUIServiceFactory::GetForProfile(browser->profile())->
-      SyncConfirmationUIClosed(results);
+      SyncConfirmationUIClosed(result);
   browser->CloseModalSigninWindow();
 }