Delay loading the NTP after sign in until MergeSession has been performed in

chrome/browser/signin/signin_tracker.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_SIGNIN_SIGNIN_TRACKER_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_TRACKER_H_
 
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/signin/google_auto_login_helper.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class Profile;
 
 // The signin flow logic is spread across several classes with varying
 // responsibilities:
@@ skipping 22 matching lines @@
 // not aware of the state of any signed in services.
 //
 // OAuth2TokenService - Maintains and manages OAuth2 tokens for the accounts
 // connected to this profile.
 //
 // ProfileSyncService - Provides the external API for interacting with the
 // sync framework. Listens for notifications for tokens to know when to startup
 // sync, and provides an Observer interface to notify the UI layer of changes
 // in sync state so they can be reflected in the UI.
 class SigninTracker : public content::NotificationObserver,
-                      public OAuth2TokenService::Observer {
+                      public OAuth2TokenService::Observer,
+                      public GoogleAutoLoginHelper::Observer {
  public:
   class Observer {
    public:
     // The signin attempt failed, and the cause is passed in |error|.
     virtual void SigninFailed(const GoogleServiceAuthError& error) = 0;
 
     // The signin attempt succeeded.
     virtual void SigninSuccess() = 0;
+
+    // The signed in account has been merged into the content area cookie jar.
+    // This will be called only after a call to SigninSuccess().
+    virtual void MergeSessionComplete(const GoogleServiceAuthError& error) = 0;
   };
 
   // Creates a SigninTracker that tracks the signin status on the passed
   // |profile|, and notifies the |observer| on status changes. |observer| must
   // be non-null and must outlive the SigninTracker.
   SigninTracker(Profile* profile, Observer* observer);
   virtual ~SigninTracker();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // OAuth2TokenService::Observer implementation.
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
   virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
 
  private:
   // Initializes this by adding notifications and observers.
   void Initialize();
 
+  // GoogleAutoLoginHelper::Observer implementation.
+  virtual void MergeSessionCompleted(
+      const std::string& account_id,
+      const GoogleServiceAuthError& error) OVERRIDE;
+
   // The profile whose signin status we are tracking.
   Profile* profile_;
 
   // Weak pointer to the observer we call when the signin state changes.
   Observer* observer_;
 
   // Used to listen to notifications from the SigninManager.
   content::NotificationRegistrar registrar_;
 
+  scoped_ptr<GoogleAutoLoginHelper> merge_session_helper_;
+
   DISALLOW_COPY_AND_ASSIGN(SigninTracker);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_TRACKER_H_