Setup from settings should allow configuration first

chrome/browser/ui/webui/sync_setup_handler.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_SYNC_SETUP_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/signin/signin_tracker.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
+#include "content/public/browser/web_contents_observer.h"
 
 class LoginUIService;
 class ProfileManager;
 class ProfileSyncService;
 class SigninManager;
 
+namespace content {
+class WebContents;
+}
+
 class SyncSetupHandler : public options::OptionsPageUIHandler,
                          public SigninTracker::Observer,
-                         public LoginUIService::LoginUI {
+                         public LoginUIService::LoginUI,
+                         public content::WebContentsObserver {
  public:
   // Constructs a new SyncSetupHandler. |profile_manager| may be NULL.
   explicit SyncSetupHandler(ProfileManager* profile_manager);
   virtual ~SyncSetupHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(base::DictionaryValue* localized_strings)
       OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
 
   // SigninTracker::Observer implementation.
   virtual void GaiaCredentialsValid() OVERRIDE;
   virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
   virtual void SigninSuccess() OVERRIDE;
 
   // LoginUIService::LoginUI implementation.
   virtual void FocusUI() OVERRIDE;
   virtual void CloseUI() OVERRIDE;
 
+  // content::WebContentsObserver implementation.
+  virtual void WebContentsDestroyed(
+      content::WebContents* web_contents) OVERRIDE;
+
   static void GetStaticLocalizedValues(
       base::DictionaryValue* localized_strings,
       content::WebUI* web_ui);
 
   // Initializes the sync setup flow and shows the setup UI. If |force_login| is
   // true, then the user is forced through the login flow even if they are
   // already signed in (useful for when it is necessary to force the user to
   // re-enter credentials so new tokens can be fetched).
   void OpenSyncSetup(bool force_login);
 
@@ skipping 105 matching lines @@
                 const std::string& password,
                 const std::string& captcha,
                 const std::string& access_code);
 
   // If a wizard already exists, focus it and return true.
   bool FocusExistingWizardIfPresent();
 
   // Invokes the javascript call to close the setup overlay.
   void CloseOverlay();
 
+  // When using web-flow, closes the Gaia page used to collection user
+  // credentials.
+  void CloseGaiaSigninPage();
+
   // Returns true if the given login data is valid, false otherwise. If the
   // login data is not valid then on return |error_message| will be set to  a
   // localized error message. Note, |error_message| must not be NULL.
   bool IsLoginAuthDataValid(const std::string& username,
                             string16* error_message);
 
   // Returns the SigninManager for the parent profile.
   SigninManager* GetSignin() const;
 
   // The SigninTracker object used to determine when the user has fully signed
@@ skipping 17 matching lines @@
   GoogleServiceAuthError last_signin_error_;
 
   // When setup starts with login UI, retry login if signing in failed.
   // When setup starts without login UI, do not retry login and fail.
   bool retry_on_signin_failure_;
 
   // The OneShotTimer object used to timeout of starting the sync backend
   // service.
   scoped_ptr<base::OneShotTimer<SyncSetupHandler> > backend_start_timer_;
 
+  // When using web-flow, pointer to the tab that holds the Gaia sign in page.

[James Hawkins, 2012/12/04 00:14:48]

nit: 'weak pointer' I imagine.

[Roger Tawa OOO till Jul 10th, 2012/12/04 00:36:37]

Done.

+  content::WebContents* active_gaia_signin_tab_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SYNC_SETUP_HANDLER_H_