Index: chrome/browser/chromeos/preferences.h |
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h |
index 5948cdad221a587c7003623b2e86aa7b812ef33c..d0b3d91e32c37f2a52f954e955173bb1482e1881 100644 |
--- a/chrome/browser/chromeos/preferences.h |
+++ b/chrome/browser/chromeos/preferences.h |
@@ -13,7 +13,7 @@ |
#include "chrome/browser/chromeos/language_preferences.h" |
#include "components/prefs/pref_change_registrar.h" |
#include "components/prefs/pref_member.h" |
-#include "components/syncable_prefs/pref_service_syncable_observer.h" |
+#include "components/sync_preferences/pref_service_syncable_observer.h" |
#include "components/user_manager/user_manager.h" |
#include "ui/base/ime/chromeos/input_method_manager.h" |
@@ -21,7 +21,7 @@ class PrefRegistrySimple; |
class PrefService; |
class TracingManager; |
-namespace syncable_prefs { |
+namespace sync_preferences { |
class PrefServiceSyncable; |
} |
@@ -42,7 +42,7 @@ class InputMethodSyncer; |
// is first initialized, it will initialize the OS settings to what's stored in |
// the preferences. These include touchpad settings, etc. |
// When the preferences change, we change the settings to reflect the new value. |
-class Preferences : public syncable_prefs::PrefServiceSyncableObserver, |
+class Preferences : public sync_preferences::PrefServiceSyncableObserver, |
public ash::ShellObserver, |
public user_manager::UserManager::UserSessionStateObserver { |
public: |
@@ -60,7 +60,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver, |
void Init(Profile* profile, const user_manager::User* user); |
void InitUserPrefsForTesting( |
- syncable_prefs::PrefServiceSyncable* prefs, |
+ sync_preferences::PrefServiceSyncable* prefs, |
const user_manager::User* user, |
scoped_refptr<input_method::InputMethodManager::State> ime_state); |
void SetInputMethodListForTesting(); |
@@ -73,7 +73,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver, |
}; |
// Initializes all member prefs. |
- void InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs); |
+ void InitUserPrefs(sync_preferences::PrefServiceSyncable* prefs); |
// Callback method for preference changes. |
void OnPreferenceChanged(const std::string& pref_name); |
@@ -104,7 +104,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver, |
// on the cmd line. |
void ForceNaturalScrollDefault(); |
- // syncable_prefs::PrefServiceSyncableObserver implementation. |
+ // sync_preferences::PrefServiceSyncableObserver implementation. |
void OnIsSyncingChanged() override; |
// Overriden from ash::ShellObserver. |
@@ -115,7 +115,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver, |
void ActivateInputMethods(const user_manager::User* active_user); |
- syncable_prefs::PrefServiceSyncable* prefs_; |
+ sync_preferences::PrefServiceSyncable* prefs_; |
input_method::InputMethodManager* input_method_manager_; |
std::unique_ptr<TracingManager> tracing_manager_; |