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

chrome/browser/signin/signin_manager.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.
 //
 // The signin manager encapsulates some functionality tracking
 // which user is signed in. See SigninManagerBase for full description of
 // responsibilities. The class defined in this file provides functionality
 // required by all platforms except Chrome OS.
 //
 // When a user is signed in, a ClientLogin request is run on their behalf.
@@ skipping 13 matching lines @@
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/google_auto_login_helper.h"
 #include "chrome/browser/signin/signin_internals_util.h"
 #include "chrome/browser/signin/signin_manager_base.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/google_service_auth_error.h"
 #include "net/cookies/canonical_cookie.h"
 
 class CookieSettings;
@@ skipping 134 matching lines @@
   // if it is safe to sign the user in from the current context (see
   // OneClickSigninHelper).  All of this tracking state is reset once the
   // renderer process terminates.
   //
   // N.B. This is the id returned by RenderProcessHost::GetID().
   void SetSigninProcess(int host_id);
   void ClearSigninProcess();
   bool IsSigninProcess(int host_id) const;
   bool HasSigninProcess() const;
 
+  // Add or remove observers for the merge session notification.
+  void AddMergeSessionObserver(GoogleAutoLoginHelper::Observer* observer);
+  void RemoveMergeSessionObserver(GoogleAutoLoginHelper::Observer* observer);
+
  protected:
   // Flag saying whether signing out is allowed.
   bool prohibit_signout_;
 
  private:
   enum SigninType {
     SIGNIN_TYPE_NONE,
     SIGNIN_TYPE_WITH_CREDENTIALS,
     SIGNIN_TYPE_WITH_OAUTH_CODE
   };
@@ skipping 86 matching lines @@
 
   scoped_ptr<SigninManagerDelegate> delegate_;
 
   // Helper object to listen for changes to signin preferences stored in non-
   // profile-specific local prefs (like kGoogleServicesUsernamePattern).
   PrefChangeRegistrar local_state_pref_registrar_;
 
   // Helper object to listen for changes to the signin allowed preference.
   BooleanPrefMember signin_allowed_;
 
+  // Helper to merge signed in account into the content area.
+  scoped_ptr<GoogleAutoLoginHelper> merge_session_helper_;
+
   DISALLOW_COPY_AND_ASSIGN(SigninManager);
 };
 
 #endif  // !defined(OS_CHROMEOS)
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_MANAGER_H_