Merge 182894 - 3rd attempt

chrome/browser/chromeos/login/user_manager_impl.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_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 67 matching lines @@
   virtual bool IsCurrentUserNew() const OVERRIDE;
   virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const OVERRIDE;
   virtual bool CanCurrentUserLock() const OVERRIDE;
   virtual bool IsUserLoggedIn() const OVERRIDE;
   virtual bool IsLoggedInAsRegularUser() const OVERRIDE;
   virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
   virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual bool IsLoggedInAsStub() const OVERRIDE;
   virtual bool IsSessionStarted() const OVERRIDE;
+  virtual MergeSessionState GetMergeSessionState() const OVERRIDE;
+  virtual void SetMergeSessionState(MergeSessionState status) OVERRIDE;
   virtual bool HasBrowserRestarted() const OVERRIDE;
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& email) const OVERRIDE;
   virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void NotifyLocalStateChanged() OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 61 matching lines @@
   // updated list of public accounts is received from policy.
   bool UpdateAndCleanUpPublicAccounts(const base::ListValue& public_accounts);
 
   // Updates the display name for public account |username| from policy settings
   // associated with that username.
   void UpdatePublicAccountDisplayName(const std::string& username);
 
   // Notifies the UI about a change to the user list.
   void NotifyUserListChanged();
 
+  // Notifies observers that merge session state had changed.
+  void NotifyMergeSessionStateChanged();
+
   // Interface to the signed settings store.
   CrosSettings* cros_settings_;
 
   // Interface to device-local account definitions and associated policy.
   policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_;
 
   // True if users have been loaded from prefs already.
   bool users_loaded_;
 
   // List of all known users. User instances are owned by |this|. Regular users
@@ skipping 23 matching lines @@
   // such users by not adding them to the persistent user list, not downloading
   // their custom avatars and mounting their cryptohomes using tmpfs. Defaults
   // to |false|.
   bool is_current_user_ephemeral_regular_user_;
 
   // Cached flag indicating whether the ephemeral user policy is enabled.
   // Defaults to |false| if the value has not been read from trusted device
   // policy yet.
   bool ephemeral_users_enabled_;
 
-  // True if user pod row is showed at login screen.
-  bool show_users_;
+  // Merge session state (cookie restore process state).
+  MergeSessionState merge_session_state_;
 
   // Cached name of device owner. Defaults to empty string if the value has not
   // been read from trusted device policy yet.
   std::string owner_email_;
 
   content::NotificationRegistrar registrar_;
 
   // Profile sync service which is observed to take actions after sync
   // errors appear. NOTE: there is no guarantee that it is the current sync
   // service, so do NOT use it outside |OnStateChanged| method.
   ProfileSyncService* observed_sync_service_;
 
   ObserverList<UserManager::Observer> observer_list_;
 
   // User avatar manager.
   scoped_ptr<UserImageManagerImpl> user_image_manager_;
 
   // Session length limiter.
   scoped_ptr<SessionLengthLimiter> session_length_limiter_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_