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

Unified Diff: chrome/browser/ui/ash/chrome_launcher_prefs.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 2 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/ui/ash/chrome_launcher_prefs.cc
diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
index b16755fbc5369a1d668f92e68b0c46ddcc3338cf..05dd8703519502120b00067ece466a6c3e931127 100644
--- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
@@ -26,7 +26,7 @@
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "components/sync/model/string_ordinal.h"
-#include "components/syncable_prefs/pref_service_syncable.h"
+#include "components/sync_preferences/pref_service_syncable.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
@@ -199,7 +199,7 @@ std::vector<std::string> GetActivitiesForPackage(
// If no user-set value exists at |local_path|, the value from |synced_path| is
// copied to |local_path|.
void PropagatePrefToLocalIfNotSet(
- syncable_prefs::PrefServiceSyncable* pref_service,
+ sync_preferences::PrefServiceSyncable* pref_service,
const char* local_path,
const char* synced_path) {
if (!pref_service->FindPreference(local_path)->HasUserSetting())
@@ -485,7 +485,7 @@ std::vector<AppLauncherId> GetPinnedAppsFromPrefsLegacy(
// static
std::unique_ptr<ChromeLauncherPrefsObserver>
ChromeLauncherPrefsObserver::CreateIfNecessary(Profile* profile) {
- syncable_prefs::PrefServiceSyncable* prefs =
+ sync_preferences::PrefServiceSyncable* prefs =
PrefServiceSyncableFromProfile(profile);
if (!prefs->FindPreference(prefs::kShelfAlignmentLocal)->HasUserSetting() ||
!prefs->FindPreference(prefs::kShelfAutoHideBehaviorLocal)
@@ -500,7 +500,7 @@ ChromeLauncherPrefsObserver::~ChromeLauncherPrefsObserver() {
}
ChromeLauncherPrefsObserver::ChromeLauncherPrefsObserver(
- syncable_prefs::PrefServiceSyncable* prefs)
+ sync_preferences::PrefServiceSyncable* prefs)
: prefs_(prefs) {
// This causes OnIsSyncingChanged to be called when the value of
// PrefService::IsSyncing() changes.

Powered by Google App Engine
This is Rietveld 408576698