chrome/renderer/content_settings_observer.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: chrome/renderer/content_settings_observer.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') | « chrome/browser/ui/website_settings/website_settings_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/content_settings_pref_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/content_settings_observer.cc

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc

index 661c941e7ef71b0cf18d67ee24167156855bfd35..5c67c5dc5759bc8cd4cff126cc0ac0e647b539f2 100644

--- a/chrome/renderer/content_settings_observer.cc

+++ b/chrome/renderer/content_settings_observer.cc

@@ -297,7 +297,7 @@ bool ContentSettingsObserver::allowImage(bool enabled_per_settings,

if (IsWhitelistedForContentSettings())

return true;

+#if !defined(OS_ANDROID)

if (content_setting_rules_) {

GURL secondary_url(image_url);

allow =

@@ -305,6 +305,7 @@ bool ContentSettingsObserver::allowImage(bool enabled_per_settings,

render_frame()->GetWebFrame(),

secondary_url) != CONTENT_SETTING_BLOCK;

}

+#endif

}

if (!allow)

DidBlockContentType(CONTENT_SETTINGS_TYPE_IMAGES);