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..026b07db40294f70ea229e185df896ce515818c0 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service.h
+++ b/chrome/browser/ui/webui/signin/login_ui_service.h
@@ -33,13 +33,21 @@ 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 = 1U << 0,
     // Start sync immediately.
-    SYNC_WITH_DEFAULT_SETTINGS,
+    SYNC_WITH_DEFAULT_SETTINGS = 1U << 1,
     // Show the user the sync settings before starting sync.
-    CONFIGURE_SYNC_FIRST,
+    CONFIGURE_SYNC_FIRST = 1U << 2,
     // The signing process was aborted, don't start sync or show settings.
-    ABORT_SIGNIN,
+    ABORT_SIGNIN = 1U << 3,
+
+    DEFAULT_SETTINGS_OPEN_ACTIVITY_CONTROLS_URL = SYNC_WITH_DEFAULT_SETTINGS |

[Evan Stade, 2016/03/30 22:40:48]

don't add these, instead you must change switch/case statements to if-else
waterfalls

[Moe, 2016/03/31 19:09:29]

Done.

+                                                  OPEN_ACTIVITY_CONTROLS_URL,
+
+    CONFIGURE_FIRST_OPEN_ACTIVITY_CONTROLS_URL = CONFIGURE_SYNC_FIRST |
+                                                 OPEN_ACTIVITY_CONTROLS_URL,
   };
 
   // Interface for obervers of LoginUIService.
@@ -56,7 +64,7 @@ class LoginUIService : public KeyedService {
     // 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) {}
+        SyncConfirmationUIClosedResult result) {}
 
     // Called when a confirmation UI for untrusted signin is shown.
     virtual void OnUntrustedLoginUIShown() {}
@@ -86,7 +94,7 @@ class LoginUIService : public KeyedService {
   void LoginUIClosed(LoginUI* ui);
 
   // Called when the sync settings confirmation UI is closed.
-  void SyncConfirmationUIClosed(SyncConfirmationUIClosedResults results);
+  void SyncConfirmationUIClosed(SyncConfirmationUIClosedResult result);
 
   // Called when a confirmation UI for untrusted signin is shown.
   void UntrustedLoginUIShown();