chrome/browser/ui/website_settings/website_settings.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/browser/ui/website_settings/website_settings.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: address review comments, minor change 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 | « chrome/browser/content_settings/tab_specific_content_settings_unittest.cc ('k') | chrome/browser/ui/website_settings/website_settings_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 42bfcaee6125a106e6f80040c3a595899d08058b..eb8ff4ba20f1680ac71fb1064e46c6322a983106 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -105,13 +105,17 @@ ContentSettingsType kPermissionType[] = {

CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

#endif

CONTENT_SETTINGS_TYPE_JAVASCRIPT,

+#if !defined(OS_ANDROID)

CONTENT_SETTINGS_TYPE_PLUGINS,

CONTENT_SETTINGS_TYPE_IMAGES,

+#endif

CONTENT_SETTINGS_TYPE_POPUPS,

CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

CONTENT_SETTINGS_TYPE_KEYGEN,

CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,

+#if !defined(OS_ANDROID)

CONTENT_SETTINGS_TYPE_MOUSELOCK,

+#endif

CONTENT_SETTINGS_TYPE_FULLSCREEN,

CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

};