Show sync setup in same tab as sign in instead of active tab.

chrome/browser/ui/sync/one_click_signin_helper.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_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 75 matching lines @@
 
 // Arguments used with StartSync function.  base::Bind() cannot support too
 // many args for performance reasons, so they are packaged up into a struct.
 struct StartSyncArgs {
   StartSyncArgs(Profile* profile,
                 Browser* browser,
                 OneClickSigninHelper::AutoAccept auto_accept,
                 const std::string& session_index,
                 const std::string& email,
                 const std::string& password,
-                bool force_same_tab_navigation,
+                content::WebContents* web_contents,
                 bool untrusted_confirmation_required,
                 signin::Source source,
                 OneClickSigninSyncStarter::Callback callback);
 
   Profile* profile;
   Browser* browser;
   OneClickSigninHelper::AutoAccept auto_accept;
   std::string session_index;
   std::string email;
   std::string password;
-  bool force_same_tab_navigation;
+
+  // Web contents in which the sync setup page should be displayed,
+  // if necessary. Can be NULL.
+  content::WebContents* web_contents;
+
   OneClickSigninSyncStarter::ConfirmationRequired confirmation_required;
   signin::Source source;
   OneClickSigninSyncStarter::Callback callback;
 };
 
 StartSyncArgs::StartSyncArgs(Profile* profile,
                              Browser* browser,
                              OneClickSigninHelper::AutoAccept auto_accept,
                              const std::string& session_index,
                              const std::string& email,
                              const std::string& password,
-                             bool force_same_tab_navigation,
+                             content::WebContents* web_contents,
                              bool untrusted_confirmation_required,
                              signin::Source source,
                              OneClickSigninSyncStarter::Callback callback)
     : profile(profile),
       browser(browser),
       auto_accept(auto_accept),
       session_index(session_index),
       email(email),
       password(password),
-      force_same_tab_navigation(force_same_tab_navigation),
+      web_contents(web_contents),
       source(source),
       callback(callback) {
   if (untrusted_confirmation_required) {
     confirmation_required = OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN;
   } else if (source == signin::SOURCE_SETTINGS ||
              source == signin::SOURCE_WEBSTORE_INSTALL) {
     // Do not display a status confirmation for webstore installs or re-auth.
     confirmation_required = OneClickSigninSyncStarter::NO_CONFIRMATION;
   } else {
     confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
@@ skipping 96 matching lines @@
 void StartSync(const StartSyncArgs& args,
                OneClickSigninSyncStarter::StartSyncMode start_mode) {
   if (start_mode == OneClickSigninSyncStarter::UNDO_SYNC) {
     LogOneClickHistogramValue(one_click_signin::HISTOGRAM_UNDO);
     return;
   }
 
   // The starter deletes itself once its done.
   new OneClickSigninSyncStarter(args.profile, args.browser, args.session_index,
                                 args.email, args.password, start_mode,
-                                args.force_same_tab_navigation,
+                                args.web_contents,
                                 args.confirmation_required,
                                 args.source,
                                 args.callback);
 
   int action = one_click_signin::HISTOGRAM_MAX;
   switch (args.auto_accept) {
     case OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT:
       break;
     case OneClickSigninHelper::AUTO_ACCEPT_ACCEPTED:
       action =
@@ skipping 881 matching lines @@
     return;
   }
 
   // When the user uses the first-run, ntp, or hotdog menu to sign in, then have
   // the option of checking the the box "Let me choose what to sync".  When the
   // sign in process started, the source parameter in the continue URL may have
   // indicated one of the three options above.  However, once this box is
   // checked, the source parameter will indicate settings.  This will only be
   // communicated back to chrome when Gaia redirects to the continue URL, and
   // this is considered here a last minute change to the source.  See a little
-  // further below for when this variable is set to true.
-  bool force_same_tab_navigation = false;
+  // further below for when this variable is set to a web contents that must be
+  // used to show the sync setup page.
+  content::WebContents* sync_setup_contents = NULL;
 
   if (!continue_url_match && IsValidGaiaSigninRedirectOrResponseURL(url))
     return;
 
   // During an explicit sign in, if the user has not yet reached the final
   // continue URL, wait for it to arrive. Note that Gaia will add some extra
   // query parameters to the continue URL.  Ignore them when checking to
   // see if the user has continued.
   //
   // If this is not an explicit sign in, we don't need to check if we landed
@@ skipping 15 matching lines @@
     // source of the continue URL.  Make one last check of the current URL
     // to see if there is a valid source.  If so, it overrides the
     // current source.
     //
     // If the source was changed to SOURCE_SETTINGS, we want
     // OneClickSigninSyncStarter to reuse the current tab to display the
     // advanced configuration.
     signin::Source source = signin::GetSourceForPromoURL(url);
     if (source != source_) {
       source_ = source;
-      force_same_tab_navigation = source == signin::SOURCE_SETTINGS;
-      switched_to_advanced_ = source == signin::SOURCE_SETTINGS;
+      if (source == signin::SOURCE_SETTINGS) {
+        sync_setup_contents = web_contents();

[noms, 2013/08/08 20:19:24]

What's the difference between web_contents() here and contents on line 1197
below?

[Roger Tawa OOO till Jul 10th, 2013/08/08 20:49:54]

They are the same.  See line 1076 above.

[fdoray, 2013/08/09 15:31:13]

Should I use |contents|?

On 2013/08/08 20:49:54, Roger Tawa wrote:

+        switched_to_advanced_ = true;
+      }
     }
   }
 
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
 
   VLOG(1) << "OneClickSigninHelper::DidStopLoading: signin is go."
           << " auto_accept=" << auto_accept_
           << " source=" << source_;
 
   switch (auto_accept_) {
     case AUTO_ACCEPT_NONE:
       if (showing_signin_)
         LogOneClickHistogramValue(one_click_signin::HISTOGRAM_DISMISSED);
       break;
     case AUTO_ACCEPT_ACCEPTED:
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_ACCEPTED);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_WITH_DEFAULTS);
       SigninManager::DisableOneClickSignIn(profile);
       // Start syncing with the default settings - prompt the user to sign in
       // first.
-      StartSync(StartSyncArgs(profile, browser, auto_accept_,
-                              session_index_, email_, password_,
-                              false /* force_same_tab_navigation */,
-                              true /* confirmation_required */, source_,
-                              CreateSyncStarterCallback()),
-                OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
+      StartSync(
+          StartSyncArgs(profile, browser, auto_accept_,
+                        session_index_, email_, password_,
+                        NULL /* don't force to show sync setup in same tab */,
+                        true /* confirmation_required */, source_,
+                        CreateSyncStarterCallback()),
+          OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
       break;
     case AUTO_ACCEPT_CONFIGURE:
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_ACCEPTED);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_WITH_ADVANCED);
       SigninManager::DisableOneClickSignIn(profile);
       // Display the extra confirmation (even in the SAML case) in case this
       // was an untrusted renderer.
       StartSync(
-          StartSyncArgs(profile, browser, auto_accept_, session_index_, email_,
-                        password_, false /* force_same_tab_navigation */,
+          StartSyncArgs(profile, browser, auto_accept_,
+                        session_index_, email_, password_,
+                        NULL  /* don't force to show sync setup in same tab */,
                         true /* confirmation_required */, source_,
                         CreateSyncStarterCallback()),
           OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
       break;
     case AUTO_ACCEPT_EXPLICIT: {
       signin::Source original_source =
           signin::GetSourceForPromoURL(original_continue_url_);
       if (switched_to_advanced_) {
         LogHistogramValue(original_source,
                           one_click_signin::HISTOGRAM_WITH_ADVANCED);
@@ skipping 19 matching lines @@
 
       std::string last_email =
           profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
 
       if (!last_email.empty() && !gaia::AreEmailsSame(last_email, email_)) {
         // If the new email address is different from the email address that
         // just signed in, show a confirmation dialog.
 
         // No need to display a second confirmation so pass false below.
         // TODO(atwilson): Move this into OneClickSigninSyncStarter.
+        // If |sync_setup_contents| is deleted before the callback execution,
+        // the tab modal dialog is closed and the callback is never executed.
         ConfirmEmailDialogDelegate::AskForConfirmation(
             contents,
             last_email,
             email_,
             base::Bind(
                 &StartExplicitSync,
                 StartSyncArgs(profile, browser, auto_accept_,
                               session_index_, email_, password_,
-                              force_same_tab_navigation,
+                              sync_setup_contents,
                               false /* confirmation_required */, source_,
                               CreateSyncStarterCallback()),
                 contents,
                 start_mode));
       } else {
         StartSync(
             StartSyncArgs(profile, browser, auto_accept_, session_index_,
-                          email_, password_, force_same_tab_navigation,
+                          email_, password_, sync_setup_contents,
                           untrusted_confirmation_required_, source_,
                           CreateSyncStarterCallback()),
             start_mode);
 
         // If this explicit sign in is not from settings page/webstore, show
         // the NTP/Apps page after sign in completes. In the case of the
         // settings page, it will get auto-closed after sync setup. In the case
         // of webstore, it will redirect back to webstore.
         RedirectToNtpOrAppsPageIfNecessary(web_contents(), source_);
       }
@@ skipping 83 matching lines @@
     // If the web contents is showing a blank page and not about to be closed,
     // redirect to the NTP or apps page.
     if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) &&
         !signin::IsAutoCloseEnabledInURL(original_continue_url_)) {
       RedirectToNtpOrAppsPage(
           web_contents(),
           signin::GetSourceForPromoURL(original_continue_url_));
     }
   }
 }