Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2642)

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.h

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More test fixing... Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..71ca4b32e058bbb4f75377b14e1338d8b197dcfc 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/user_manager_impl.h
@@ -16,6 +16,7 @@
#include "base/synchronization/lock.h"
#include "base/time.h"
#include "base/timer.h"
+#include "chrome/browser/chromeos/login/device_settings_service.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"
@@ -25,11 +26,11 @@
#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_;

Powered by Google App Engine
This is Rietveld 408576698