chrome/browser/content_settings/host_content_settings_map_factory.cc - Issue 2078893002: Add callback list to PrefModelAssociator after sync data is loaded

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 2078893002: Add callback list to PrefModelAssociator after sync data is loaded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_domain_scoped_settings

Patch Set: Created 4 years, 6 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 | « no previous file | chrome/browser/download/download_request_limiter_unittest.cc » ('j') | chrome/browser/download/download_request_limiter_unittest.cc » ('J')
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 a96b421a0b5b60922df8ae6d707b64ec12aa304b..9ca044da239e841773225388fbea50a29f120de7 100644

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

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

@@ -6,6 +6,7 @@

#include <utility>

+#include "chrome/browser/prefs/pref_service_syncable_util.h"

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

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

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

@@ -70,7 +71,8 @@ scoped_refptr<RefcountedKeyedService>

scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(

profile->GetPrefs(),

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

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

+ profile->GetProfileType() == Profile::GUEST_PROFILE,

+ PrefServiceSyncableFromProfile(profile)));

#if defined(ENABLE_EXTENSIONS)

ExtensionService *ext_service =

« no previous file with comments | « no previous file | chrome/browser/download/download_request_limiter_unittest.cc » ('j') | chrome/browser/download/download_request_limiter_unittest.cc » ('J')