components/content_settings/core/browser/content_settings_utils.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_utils.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

« components/content_settings/core/browser/content_settings_registry_unittest.cc ('K') | « components/content_settings/core/browser/content_settings_registry_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6bae3d8fcacb98411f2b06a921257cf68a1093ae..6b0574c70aa054d25c7b9f431c7f4e18ef34a5dd 100644

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

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

@@ -133,10 +133,12 @@ std::unique_ptr<base::Value> ContentSettingToValue(ContentSetting setting) {

void GetRendererContentSettingRules(const HostContentSettingsMap* map,

RendererContentSettingRules* rules) {

+#if !defined(OS_ANDROID)

map->GetSettingsForOneType(

CONTENT_SETTINGS_TYPE_IMAGES,

ResourceIdentifier(),

&(rules->image_rules));

+#endif

map->GetSettingsForOneType(

CONTENT_SETTINGS_TYPE_JAVASCRIPT,

ResourceIdentifier(),