components/content_settings/core/browser/content_settings_pref_provider.cc - Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android

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: components/content_settings/core/browser/content_settings_pref_provider.cc

Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@only_register_platform_used_contentsettingtypes

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

« chrome/browser/ui/website_settings/website_settings_unittest.cc ('K') | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_registry.cc » ('j') | components/content_settings/core/browser/content_settings_registry_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_pref_provider.cc

diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc

index c544e186aa2f6482e2fa1632f9fe2e41c4545921..5bb1886e0cb2b10c229bde2be21fe4f6166a63e1 100644

--- a/components/content_settings/core/browser/content_settings_pref_provider.cc

+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc

@@ -143,7 +143,6 @@ bool PrefProvider::SetWebsiteSetting(

resource_identifier.empty()) {

return false;

}

return GetPref(content_type)

->SetWebsiteSetting(primary_pattern, secondary_pattern,

resource_identifier, in_value);

@@ -153,7 +152,6 @@ void PrefProvider::ClearAllContentSettingsRules(

ContentSettingsType content_type) {

DCHECK(CalledOnValidThread());

DCHECK(prefs_);

raymes 2016/06/07 01:40:44 nit: these changes aren't needed in this CL

lshang 2016/06/07 06:40:00 Done.

GetPref(content_type)->ClearAllContentSettingsRules();

}