| Index: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
|
| diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
|
| index 64bc233a76f5564070446d7520302510f3d8d9f0..7d03d257ee28f52ae1fa1003632dfaf766cb6ca0 100644
|
| --- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
|
| +++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
|
| @@ -9,7 +9,7 @@
|
| #include <string>
|
|
|
| #include "base/observer_list.h"
|
| -#include "components/syncable_prefs/pref_service_syncable_observer.h"
|
| +#include "components/sync_preferences/pref_service_syncable_observer.h"
|
| #include "content/public/browser/notification_observer.h"
|
|
|
| class PrefChangeRegistrar;
|
| @@ -19,7 +19,7 @@ namespace content {
|
| class NotificationRegistrar;
|
| }
|
|
|
| -namespace syncable_prefs {
|
| +namespace sync_preferences {
|
| class PrefServiceSyncable;
|
| }
|
|
|
| @@ -36,7 +36,7 @@ namespace chromeos {
|
| // This class is responsible for keeping local user image synced with
|
| // image saved in syncable preference.
|
| class UserImageSyncObserver
|
| - : public syncable_prefs::PrefServiceSyncableObserver,
|
| + : public sync_preferences::PrefServiceSyncableObserver,
|
| public content::NotificationObserver {
|
| public:
|
| class Observer {
|
| @@ -64,7 +64,7 @@ class UserImageSyncObserver
|
| void RemoveObserver(Observer* observer);
|
|
|
| private:
|
| - // syncable_prefs::PrefServiceSyncableObserver implementation.
|
| + // sync_preferences::PrefServiceSyncableObserver implementation.
|
| void OnIsSyncingChanged() override;
|
|
|
| // content::NotificationObserver implementation.
|
| @@ -97,7 +97,7 @@ class UserImageSyncObserver
|
| const user_manager::User* user_;
|
| std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
|
| std::unique_ptr<content::NotificationRegistrar> notification_registrar_;
|
| - syncable_prefs::PrefServiceSyncable* prefs_;
|
| + sync_preferences::PrefServiceSyncable* prefs_;
|
| bool is_synced_;
|
| // Indicates if local user image changed during initialization.
|
| bool local_image_changed_;
|
|
|