Merge 130722 - On ChromeOS, the user is always signed in and we should not

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 "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 45 matching lines @@
     virtual void GaiaCredentialsValid() = 0;
 
     // The signin attempt failed. If this is called after GaiaCredentialsValid()
     // then it means there was an error launching one of the dependent services.
     virtual void SigninFailed(const GoogleServiceAuthError& error) = 0;
 
     // The signin attempt succeeded.
     virtual void SigninSuccess() = 0;
   };
 
+  // The various states the login process can be in.
+  enum LoginState {
+    WAITING_FOR_GAIA_VALIDATION,
+    SERVICES_INITIALIZING,
+    SIGNIN_COMPLETE
+  };
+
   // 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);
+  SigninTracker(Profile* profile, Observer* observer, LoginState state);
   virtual ~SigninTracker();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
 
   // Returns true if the various authenticated services are properly signed in
   // (all tokens loaded, no auth/startup errors, etc).
   static bool AreServicesSignedIn(Profile* profile);
 
   // Returns true if the tokens are loaded for all signed-in services.
   static bool AreServiceTokensLoaded(Profile* profile);
 
  private:
-  // The various states the login process can be in.
-  enum LoginState {
-    WAITING_FOR_GAIA_VALIDATION,
-    SERVICES_INITIALIZING,
-    SIGNIN_COMPLETE
-  };
+  // Initializes this by adding notifications and observers.
+  void Initialize();
 
   // Invoked when one of the services potentially changed its signin status so
   // we can check to see whether we need to notify our observer.
   void HandleServiceStateChange();
 
   // The current state of the login process.
   LoginState state_;
 
   // The profile whose signin status we are tracking.
   Profile* profile_;
 
   // Weak pointer to the observer we call when the signin state changes.
   Observer* observer_;
 
   // Set to true when SigninManager has validated our credentials.
   bool credentials_valid_;
 
   // Used to listen to notifications from the SigninManager.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninTracker);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_TRACKER_H_
-