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

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 "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 
@@ skipping 30 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 OneClickSigninSyncStarter::OneClickSigninSyncStarter(
     Profile* profile,
     Browser* browser,
     const std::string& session_index,
     const std::string& email,
     const std::string& password,
     StartSyncMode start_mode,
-    bool force_same_tab_navigation,
+    content::WebContents* web_contents,
     ConfirmationRequired confirmation_required,
     signin::Source source,
     Callback sync_setup_completed_callback)
-    : start_mode_(start_mode),
-      force_same_tab_navigation_(force_same_tab_navigation),
+    : content::WebContentsObserver(web_contents),
+      start_mode_(start_mode),
       confirmation_required_(confirmation_required),
       source_(source),
       sync_setup_completed_callback_(sync_setup_completed_callback),
       weak_pointer_factory_(this) {
   DCHECK(profile);
   BrowserList::AddObserver(this);
 
   Initialize(profile, browser);
 
   // Start the signin process using the cookies in the cookie jar.
@@ skipping 350 matching lines @@
   // to start up until after the configure UI is displayed (the configure UI
   // will clear the flag when the user is done setting up sync).
   ProfileSyncService* profile_sync_service = GetProfileSyncService();
   LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
   if (login_ui->current_login_ui()) {
     login_ui->current_login_ui()->FocusUI();
   } else {
     EnsureBrowser();
     if (profile_sync_service) {
       // Need to navigate to the settings page and display the sync UI.
-      if (force_same_tab_navigation_) {
-        ShowSyncSettingsPageOnSameTab();
+      if (web_contents()) {
+        ShowSyncSettingsPageInWebContents(web_contents());
       } else {
         // If the user is setting up sync for the first time, let them configure
         // advanced sync settings. However, in the case of re-authentication,
         // return the user to the settings page without showing any config UI.
         if (configure_sync) {
           chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
         } else {
           FinishProfileSyncServiceSetup();
           chrome::ShowSettings(browser_);
         }
@@ skipping 13 matching lines @@
   return service;
 }
 
 void OneClickSigninSyncStarter::FinishProfileSyncServiceSetup() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   if (service)
     service->SetSetupInProgress(false);
 }
 
-void OneClickSigninSyncStarter::ShowSyncSettingsPageOnSameTab() {
+void OneClickSigninSyncStarter::ShowSyncSettingsPageInWebContents(
+    content::WebContents* contents) {
   std::string url = std::string(chrome::kChromeUISettingsURL) +
       chrome::kSyncSetupSubPage;
-  chrome::NavigateParams params(
-      browser_, GURL(url), content::PAGE_TRANSITION_AUTO_TOPLEVEL);
-  params.disposition = CURRENT_TAB;
-  params.window_action = chrome::NavigateParams::SHOW_WINDOW;
-  chrome::Navigate(&params);
+  content::OpenURLParams params(GURL(url),
+                                content::Referrer(),
+                                CURRENT_TAB,
+                                content::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 */);
 }