Enhanced Sync Confirmation modal

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

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_
 #define CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
@@ skipping 15 matching lines @@
 
     // Invoked when the login UI should be closed. This can be invoked if the
     // user takes an action that should display new login UI.
     virtual void CloseUI() = 0;
    protected:
     virtual ~LoginUI() {}
   };
 
   // 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.
   class Observer {
    public:
     // Called when a new login UI is shown.
     // |ui| The login UI that was just shown. Will never be null.
     virtual void OnLoginUIShown(LoginUI* ui) {}
 
     // Called when a login UI is closed.
     // |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) {}
+        SyncConfirmationUIClosedResult result) {}
 
     // Called when a confirmation UI for untrusted signin is shown.
     virtual void OnUntrustedLoginUIShown() {}
 
    protected:
     virtual ~Observer() {}
   };
 
   explicit LoginUIService(Profile* profile);
   ~LoginUIService() override;
 
   // Gets the currently active login UI, or null if no login UI is active.
   LoginUI* current_login_ui() const {
     return ui_;
   }
 
   // |observer| The observer to add or remove; cannot be NULL.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Sets the currently active login UI. It is illegal to call this if there is
   // already login UI visible.
   void SetLoginUI(LoginUI* ui);
 
   // Called when login UI is closed. If the passed UI is the current login UI,
   // sets current_login_ui() to null.
   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();
 
   // Delegate to an existing login dialog if one exists.
   // If not, we make a new popup dialog window, and set it to
   // chrome://signin to ask the user to sign in to chrome.
   void ShowLoginPopup();
 
   // Displays login results.
   void DisplayLoginResult(Browser* browser, const base::string16& message);
 
   // Gets the last login result set through |DisplayLoginResult|.
   const base::string16& GetLastLoginResult();
 
  private:
   // Weak pointer to the currently active login UI, or null if none.
   LoginUI* ui_;
   Profile* profile_;
 
   // List of observers.
   base::ObserverList<Observer> observer_list_;
 
   base::string16 last_login_result_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginUIService);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_