Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

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"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_image_loader.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/image/image_skia.h"
 
+class SkBitmap;
 class FilePath;
 class PrefService;
 class ProfileDownloader;
 class ProfileSyncService;
-class SkBitmap;
 
 namespace chromeos {
 
 class RemoveUserDelegate;
 class UserImage;
 
 // Implementation of the UserManager.
 class UserManagerImpl : public UserManager,
                         public ProfileDownloaderDelegate,
                         public ProfileSyncServiceObserver,
@@ skipping 42 matching lines @@
   virtual void DownloadProfileImage(const std::string& reason) OVERRIDE;
   virtual bool IsCurrentUserOwner() const OVERRIDE;
   virtual bool IsCurrentUserNew() const OVERRIDE;
   virtual bool IsCurrentUserEphemeral() const OVERRIDE;
   virtual bool IsUserLoggedIn() const OVERRIDE;
   virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual bool IsLoggedInAsStub() const OVERRIDE;
   virtual bool IsSessionStarted() const OVERRIDE;
   virtual bool IsEphemeralUser(const std::string& email) const OVERRIDE;
-  virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
-  virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
+  virtual void AddObserver(Observer* obs) OVERRIDE;
+  virtual void RemoveObserver(Observer* obs) OVERRIDE;
   virtual void NotifyLocalStateChanged() OVERRIDE;
   virtual const gfx::ImageSkia& DownloadedProfileImage() const OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
@@ skipping 98 matching lines @@
   // download times).
   void DownloadProfileData(const std::string& reason, bool download_image);
 
   // Scheduled call for downloading profile data.
   void DownloadProfileDataScheduled();
 
   // Deletes user's image file. Runs on FILE thread.
   void DeleteUserImage(const FilePath& image_path);
 
   // Updates current user ownership on UI thread.
-  void UpdateOwnership(DeviceSettingsService::OwnershipStatus status,
-                       bool is_owner);
+  void UpdateOwnership(bool is_owner);
 
-  // Triggers an asynchronous ownership check.
+  // Checks current user's ownership on file thread.
   void CheckOwnership();
 
   // ProfileDownloaderDelegate implementation.
   virtual bool NeedsProfilePicture() const OVERRIDE;
   virtual int GetDesiredImageSideLength() const OVERRIDE;
   virtual Profile* GetBrowserProfile() OVERRIDE;
   virtual std::string GetCachedPictureURL() const OVERRIDE;
   virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) OVERRIDE;
   virtual void OnProfileDownloadFailure(ProfileDownloader* downloader) OVERRIDE;
 
@@ skipping 45 matching lines @@
   // 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_;
+  ObserverList<Observer> observer_list_;
 
   // Download user profile image on login to update it if it's changed.
   scoped_ptr<ProfileDownloader> profile_image_downloader_;
 
   // Arbitrary string passed to the last |DownloadProfileImage| call.
   std::string profile_image_download_reason_;
 
   // Time when the profile image download has started.
   base::Time profile_image_load_start_time_;
 
@@ skipping 17 matching lines @@
 
   // Timer triggering DownloadProfileDataScheduled for refreshing profile data.
   base::RepeatingTimer<UserManagerImpl> profile_download_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_