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

chrome/browser/signin/account_reconcilor.h

 // Copyright 2013 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_ACCOUNT_RECONCILOR_H_
 #define CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "chrome/browser/signin/google_auto_login_helper.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class GaiaAuthFetcher;
 class Profile;
 struct ChromeCookieDetails;
 
 class AccountReconcilor : public BrowserContextKeyedService,
-                                 content::NotificationObserver,
-                                 GaiaAuthConsumer,
-                                 OAuth2TokenService::Consumer,
-                                 OAuth2TokenService::Observer {
+                          public content::NotificationObserver,
+                          public GaiaAuthConsumer,
+                          public OAuth2TokenService::Consumer,
+                          public OAuth2TokenService::Observer {
  public:
   explicit AccountReconcilor(Profile* profile);
   virtual ~AccountReconcilor();
 
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
+  // Add or remove observers for the merge session notification.
+  void AddMergeSessionObserver(GoogleAutoLoginHelper::Observer* observer);
+  void RemoveMergeSessionObserver(GoogleAutoLoginHelper::Observer* observer);
+
   Profile* profile() { return profile_; }
 
   bool IsPeriodicReconciliationRunning() const {
     return reconciliation_timer_.IsRunning();
   }
 
   bool IsRegisteredWithTokenService() const {
     return registered_with_token_service_;
   }
 
@@ skipping 76 matching lines @@
 
   // Overriden from GaiaAuthConsumer.
   virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE;
   virtual void OnListAccountsFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
   // The profile that this reconcilor belongs to.
   Profile* profile_;
   content::NotificationRegistrar registrar_;
   base::RepeatingTimer<AccountReconcilor> reconciliation_timer_;
+  GoogleAutoLoginHelper merge_session_helper_;
   bool registered_with_token_service_;
 
   // Used during reconcile action.
   // These members are used used to validate the gaia cookie.
   scoped_ptr<GaiaAuthFetcher> gaia_fetcher_;
   bool are_gaia_accounts_set_;
   std::vector<std::string> gaia_accounts_;
 
   // Used during reconcile action.
   // These members are used to validate the tokens in OAuth2TokenService.
   std::string primary_account_;
   std::vector<std::string> chrome_accounts_;
   scoped_ptr<OAuth2TokenService::Request>* requests_;
   ScopedVector<UserIdFetcher> user_id_fetchers_;
   std::set<std::string> valid_chrome_accounts_;
   std::set<std::string> invalid_chrome_accounts_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountReconcilor);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_H_