chrome/browser/content_settings/host_content_settings_map_factory.cc - Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/host_content_settings_map_factory.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

« no previous file with comments | « chrome/browser/content_settings/content_settings_pref_provider_unittest.cc ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map_factory.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc

index b0db710bb01c4dad3061b0d8d32527a66e663857..eedb6e1f020fe617aefd4ef9c078389b043a3893 100644

--- a/chrome/browser/content_settings/host_content_settings_map_factory.cc

+++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc

@@ -11,7 +11,7 @@

#include "chrome/browser/profiles/profile.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

-#include "components/syncable_prefs/pref_service_syncable.h"

+#include "components/sync_preferences/pref_service_syncable.h"

#include "content/public/browser/browser_thread.h"

#if defined(ENABLE_EXTENSIONS)

@@ -78,7 +78,7 @@ scoped_refptr<RefcountedKeyedService>

profile->GetProfileType() == Profile::INCOGNITO_PROFILE,

profile->GetProfileType() == Profile::GUEST_PROFILE));

- syncable_prefs::PrefServiceSyncable* pref_service =

+ sync_preferences::PrefServiceSyncable* pref_service =

PrefServiceSyncableFromProfile(profile);

if (pref_service) {

pref_service->RegisterMergeDataFinishedCallback(