Enhanced Sync Confirmation modal

chrome/browser/ui/webui/signin/login_ui_service.h

Index: chrome/browser/ui/webui/signin/login_ui_service.h
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.h b/chrome/browser/ui/webui/signin/login_ui_service.h
index ce3ffead914a26b9fa92f857195ef44f7c4c5216..9f476f18257ccf610a0f2b528d21906b37138cce 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service.h
+++ b/chrome/browser/ui/webui/signin/login_ui_service.h
@@ -33,13 +33,15 @@ class LoginUIService : public KeyedService {
 
   // Used when the sync confirmation UI is closed to signify which option was
   // selected by the user.
-  enum SyncConfirmationUIClosedResults {
+  enum SyncConfirmationUIClosedResult {
+    // Open the activity controls URL.
+    OPEN_ACTIVITY_CONTROLS_URL = 1 << 0,
     // Start sync immediately.
-    SYNC_WITH_DEFAULT_SETTINGS,
+    SYNC_WITH_DEFAULT_SETTINGS = 1 << 1,
     // Show the user the sync settings before starting sync.
-    CONFIGURE_SYNC_FIRST,
+    CONFIGURE_SYNC_FIRST = 1 << 2,
     // The signing process was aborted, don't start sync or show settings.
-    ABORT_SIGNIN,
+    ABORT_SIGNIN = 1 << 3,
   };
 
   // Interface for obervers of LoginUIService.
@@ -53,10 +55,10 @@ class LoginUIService : public KeyedService {
     // |ui| The login UI that was just closed; will never be null.
     virtual void OnLoginUIClosed(LoginUI* ui) {}
 
-    // Called when the sync confirmation UI is closed. |results| indicates the
-    // option chosen by the user in the confirmation UI.
-    virtual void OnSyncConfirmationUIClosed(
-        SyncConfirmationUIClosedResults results) {}
+    // Called when the sync confirmation UI is closed. |result| is a bitmask for
+    // the LoginUIService::SyncConfirmationUIClosedResult enum that indicates
+    // the options chosen by the user in the confirmation UI.
+    virtual void OnSyncConfirmationUIClosed(uint32_t result) {}
 
     // Called when a confirmation UI for untrusted signin is shown.
     virtual void OnUntrustedLoginUIShown() {}
@@ -85,8 +87,10 @@ class LoginUIService : public KeyedService {
   // sets current_login_ui() to null.
   void LoginUIClosed(LoginUI* ui);
 
-  // Called when the sync settings confirmation UI is closed.
-  void SyncConfirmationUIClosed(SyncConfirmationUIClosedResults results);
+  // Called when the sync confirmation UI is closed. |result| is a bitmask for
+  // the LoginUIService::SyncConfirmationUIClosedResult enum that indicates
+  // the options chosen by the user in the confirmation UI.
+  void SyncConfirmationUIClosed(uint32_t result);
 
   // Called when a confirmation UI for untrusted signin is shown.
   void UntrustedLoginUIShown();