Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/login/user_manager_impl.h

Index: chrome/browser/chromeos/login/user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h
index a1e0487d0ff2f3b14358461eefdb6ea74725929e..a02cfd88b4e306c4ce37f64fee29492ec15c5e77 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/user_manager_impl.h
@@ -20,16 +20,17 @@
 #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"
 
-class SkBitmap;
 class FilePath;
 class PrefService;
 class ProfileDownloader;
 class ProfileSyncService;
+class SkBitmap;
 
 namespace chromeos {
 
@@ -101,8 +102,8 @@ class UserManagerImpl : public UserManager,
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual bool IsLoggedInAsStub() const OVERRIDE;
   virtual bool IsSessionStarted() const OVERRIDE;
-  virtual void AddObserver(Observer* obs) OVERRIDE;
-  virtual void RemoveObserver(Observer* obs) OVERRIDE;
+  virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
+  virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void NotifyLocalStateChanged() OVERRIDE;
   virtual const SkBitmap& DownloadedProfileImage() const OVERRIDE;
 
@@ -284,9 +285,10 @@ class UserManagerImpl : public UserManager,
   void DeleteUserImage(const FilePath& image_path);
 
   // Updates current user ownership on UI thread.
-  void UpdateOwnership(bool is_owner);
+  void UpdateOwnership(DeviceSettingsService::OwnershipStatus status,
+                       bool is_owner);
 
-  // Checks current user's ownership on file thread.
+  // Triggers an asynchronous ownership check.
   void CheckOwnership();
 
   // ProfileDownloaderDelegate implementation.
@@ -356,7 +358,7 @@ class UserManagerImpl : public UserManager,
   // service, so do NOT use it outside |OnStateChanged| method.
   ProfileSyncService* observed_sync_service_;
 
-  ObserverList<Observer> observer_list_;
+  ObserverList<UserManager::Observer> observer_list_;
 
   // Download user profile image on login to update it if it's changed.
   scoped_ptr<ProfileDownloader> profile_image_downloader_;