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

chrome/browser/ui/sync/one_click_signin_sync_starter.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_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/signin/signin_tracker.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
+#include "content/public/browser/web_contents_observer.h"
 
 class Browser;
 class ProfileSyncService;
 
+namespace content {
+class WebContents;
+}  // namespace content
+
 namespace policy {
 class CloudPolicyClient;
 }
 
 // Waits for successful singin notification from the signin manager and then
 // starts the sync machine.  Instances of this class delete themselves once
 // the job is done.
 class OneClickSigninSyncStarter : public SigninTracker::Observer,
-                                  public chrome::BrowserListObserver {
+                                  public chrome::BrowserListObserver,
+                                  public content::WebContentsObserver {
  public:
   enum StartSyncMode {
     // Starts the process of signing the user in with the SigninManager, and
     // once completed automatically starts sync with all data types enabled.
     SYNC_WITH_DEFAULT_SETTINGS,
 
     // Starts the process of signing the user in with the SigninManager, and
     // once completed redirects the user to the settings page to allow them
     // to configure which data types to sync before sync is enabled.
     CONFIGURE_SYNC_FIRST,
@@ skipping 25 matching lines @@
     SYNC_SETUP_SUCCESS,
     SYNC_SETUP_FAILURE
   };
 
   typedef base::Callback<void(SyncSetupResult)> Callback;
 
   // |profile| must not be NULL, however |browser| can be. When using the
   // OneClickSigninSyncStarter from a browser, provide both.
   // If |display_confirmation| is true, the user will be prompted to confirm the
   // signin before signin completes.
+  // |web_contents| is used to show the sync setup page, if necessary. If NULL,
+  // the sync setup page will be loaded in either a new tab or a tab that is
+  // already showing it.
   // |callback| is always executed before OneClickSigninSyncStarter is deleted.
   // It can be empty.
   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 display_confirmation,
                             signin::Source source,
                             Callback callback);
 
   // chrome::BrowserListObserver override.
   virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
 
  private:
   friend class OneClickSigninSyncStarterTest;
   FRIEND_TEST_ALL_PREFIXES(OneClickSigninSyncStarterTest,
@@ skipping 74 matching lines @@
   // but we still need to call PSS::SetSetupInProgress(false). For this purpose
   // call FinishProfileSyncServiceSetup() function.
   ProfileSyncService* GetProfileSyncService();
 
   void FinishProfileSyncServiceSetup();
 
   // Displays the settings UI in a new tab. Brings up the advanced sync settings
   // dialog if |configure_sync| is true.
   void ShowSettingsPageInNewTab(bool configure_sync);
 
-  // Displays the sync configuration UI in the same tab.
-  void ShowSyncSettingsPageOnSameTab();
+  // Displays the sync configuration UI in the provided web contents.
+  void ShowSyncSettingsPageInWebContents(content::WebContents* contents);
 
   // Shows the post-signin confirmation bubble. If |custom_message| is empty,
   // the default "You are signed in" message is displayed.
   void DisplayFinalConfirmationBubble(const string16& custom_message);
 
   // Makes sure browser_ points to a valid browser (opens a new browser if
   // necessary). Useful in the case where the user has created a new Profile as
   // part of the signin process.
   void EnsureBrowser();
 
@@ skipping 15 matching lines @@
   // CloudPolicyClient reference we keep while determining whether to create
   // a new profile for an enterprise user or not.
   scoped_ptr<policy::CloudPolicyClient> policy_client_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarter);
 };
 
 
 #endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_SYNC_STARTER_H_