Enhanced Sync Confirmation modal

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

 // 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 
 #include <stddef.h>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 372 matching lines @@
     if (response == CONFIGURE_SYNC_FIRST)
       start_mode_ = response;
     else if (start_mode_ == CONFIRM_SYNC_SETTINGS_FIRST)
       start_mode_ = SYNC_WITH_DEFAULT_SETTINGS;
 
     SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
     signin->CompletePendingSignin();
   }
 }
 
-void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed(
-    LoginUIService::SyncConfirmationUIClosedResults results) {
-
+void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed(uint32_t result) {
   if (switches::UsePasswordSeparatedSigninFlow()) {
     // We didn't run this callback in AccountAddedToCookie so do it now.
     if (!sync_setup_completed_callback_.is_null())
       sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
   }
 
-  switch (results) {
-    case LoginUIService::CONFIGURE_SYNC_FIRST:
-      content::RecordAction(
-          base::UserMetricsAction("Signin_Signin_WithAdvancedSyncSettings"));
-      chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
-      break;
-    case LoginUIService::SYNC_WITH_DEFAULT_SETTINGS: {
-      content::RecordAction(
-          base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings"));
-      ProfileSyncService* profile_sync_service = GetProfileSyncService();
-      if (profile_sync_service)
-        profile_sync_service->SetFirstSetupComplete();
-      FinishProfileSyncServiceSetup();
-      break;
+  if (result & LoginUIService::CONFIGURE_SYNC_FIRST) {
+    content::RecordAction(
+        base::UserMetricsAction("Signin_Signin_WithAdvancedSyncSettings"));
+    chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
+
+    if (result & LoginUIService::OPEN_ACTIVITY_CONTROLS_URL) {
+      // Observer will delete itself
+      new OneClickSigninSyncObserver(
+          web_contents(),
+          profile_,
+          browser_,
+          GURL(chrome::kGoogleAccountActivityControlsURL),
+          continue_url_);
     }
-    case LoginUIService::ABORT_SIGNIN:
-      FinishProfileSyncServiceSetup();
-      break;
+  } else if (result & LoginUIService::SYNC_WITH_DEFAULT_SETTINGS) {
+    content::RecordAction(
+        base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings"));
+    SetFirstSetupComplete();
+    FinishProfileSyncServiceSetup();
+
+    if (result & LoginUIService::OPEN_ACTIVITY_CONTROLS_URL) {
+      // Open the 'Activity controls' section of the privacy settings page.
+      GURL url = GURL(chrome::kGoogleAccountActivityControlsURL);
+      content::OpenURLParams params(url,
+                                    content::Referrer(),
+                                    NEW_FOREGROUND_TAB,
+                                    ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                    false);
+      browser_->OpenURL(params);
+    }
+  } else if (result & LoginUIService::ABORT_SIGNIN) {
+    FinishProfileSyncServiceSetup();
+  } else {
+    NOTREACHED();
+  }
+
+  if (result & LoginUIService::OPEN_ACTIVITY_CONTROLS_URL) {
+    content::RecordAction(
+        base::UserMetricsAction("Signin_Signin_WithActivityControlsCheckbox"));
   }
 
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninFailed(
     const GoogleServiceAuthError& error) {
   if (!sync_setup_completed_callback_.is_null())
     sync_setup_completed_callback_.Run(SYNC_SETUP_FAILURE);
 
@@ skipping 38 matching lines @@
     DisplayModalSyncConfirmationWindow();
     return;
   }
 
   if (!sync_setup_completed_callback_.is_null())
     sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
 
   switch (start_mode_) {
     case SYNC_WITH_DEFAULT_SETTINGS: {
       // Just kick off the sync machine, no need to configure it first.
-      ProfileSyncService* profile_sync_service = GetProfileSyncService();
-      if (profile_sync_service)
-        profile_sync_service->SetFirstSetupComplete();
+      SetFirstSetupComplete();
       FinishProfileSyncServiceSetup();
       if (confirmation_required_ == CONFIRM_AFTER_SIGNIN) {
         base::string16 message;
-        if (!profile_sync_service) {
+        if (!GetProfileSyncService()) {
           // Sync is disabled by policy.
           message = l10n_util::GetStringUTF16(
               IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE);
         }
         DisplayFinalConfirmationBubble(message);
       }
       break;
     }
     case CONFIRM_SYNC_SETTINGS_FIRST:
       // Blocks sync until the sync settings confirmation UI is closed.
@@ skipping 108 matching lines @@
   }
 }
 
 ProfileSyncService* OneClickSigninSyncStarter::GetProfileSyncService() {
   ProfileSyncService* service = NULL;
   if (profile_->IsSyncAllowed())
     service = ProfileSyncServiceFactory::GetForProfile(profile_);
   return service;
 }
 
+void OneClickSigninSyncStarter::SetFirstSetupComplete() {
+  ProfileSyncService* profile_sync_service = GetProfileSyncService();
+  if (profile_sync_service)
+    profile_sync_service->SetFirstSetupComplete();
+}
+
 void OneClickSigninSyncStarter::FinishProfileSyncServiceSetup() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   if (service)
     service->SetSetupInProgress(false);
 }
 
 void OneClickSigninSyncStarter::ShowSettingsPageInWebContents(
     content::WebContents* contents,
     const std::string& sub_page) {
   if (!continue_url_.is_empty()) {
     // The observer deletes itself once it's done.
     DCHECK(!sub_page.empty());
-    new OneClickSigninSyncObserver(contents, continue_url_);
+    new OneClickSigninSyncObserver(contents, profile_, browser_,
+                                   GURL::EmptyGURL(), continue_url_);
   }
 
   GURL url = chrome::GetSettingsUrl(sub_page);
   content::OpenURLParams params(url,
                                 content::Referrer(),
                                 CURRENT_TAB,
                                 ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                 false);
   contents->OpenURL(params);
 
   // Activate the tab.
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
   int content_index =
       browser->tab_strip_model()->GetIndexOfWebContents(contents);
   browser->tab_strip_model()->ActivateTabAt(content_index,
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }