components/content_settings.gypi - Issue 1084123002: Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based

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.gypi

Issue 1084123002: Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp shuffle for ios Created 5 years, 8 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

Index: components/content_settings.gypi

diff --git a/components/content_settings.gypi b/components/content_settings.gypi

index 89f2b1a01bbac2698359bd1389f8da47014d793f..d0218fe0540a5ed4e394ed8c09823ba8735118f2 100644

--- a/components/content_settings.gypi

+++ b/components/content_settings.gypi

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

'../net/net.gyp:net',

'../url/url.gyp:url_lib',

'content_settings_core_common',

+ 'plugins_common',

'pref_registry',

'variables': { 'enable_wexit_time_destructors': 1, },

@@ -52,6 +53,8 @@

'content_settings/core/browser/host_content_settings_map.cc',

'content_settings/core/browser/host_content_settings_map.h',

'content_settings/core/browser/local_shared_objects_counter.h',

+ 'content_settings/core/browser/plugins_field_trial.cc',

+ 'content_settings/core/browser/plugins_field_trial.h',

# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.

'msvs_disabled_warnings': [4267, ],

« no previous file with comments | « components/components_tests.gyp ('k') | components/content_settings/core/browser/BUILD.gn » ('j') | no next file with comments »