diff options
| author | dbeam <dbeam@chromium.org> | 2015-04-20 08:34:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-20 15:35:25 +0000 |
| commit | 155ac97a453b6faf109949ed5319a90e759af9d2 (patch) | |
| tree | 57d3489b8539318126b535ac626733454cb91915 /components/plugins.gypi | |
| parent | 40ef9a95d8065eefbd57d6ef07eaa1e0dca2db4c (diff) | |
| download | chromium_src-155ac97a453b6faf109949ed5319a90e759af9d2.zip chromium_src-155ac97a453b6faf109949ed5319a90e759af9d2.tar.gz chromium_src-155ac97a453b6faf109949ed5319a90e759af9d2.tar.bz2 | |
Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based
on the results of a FieldTrial (also flags).
Still respect the user's choice when they've explicitly chosen an
alternative (e.g. they chose to BLOCK all plugins).
R=tommycli@chromium.org,bauerb@chromium.org,jochen@chromium.org
TBR=markusheintz@chromium.org
BUG=476742
Review URL: https://codereview.chromium.org/1084123002
Cr-Commit-Position: refs/heads/master@{#325846}
Diffstat (limited to 'components/plugins.gypi')
| -rw-r--r-- | components/plugins.gypi | 66 |
1 files changed, 42 insertions, 24 deletions
diff --git a/components/plugins.gypi b/components/plugins.gypi index a052b51..fde25c6 100644 --- a/components/plugins.gypi +++ b/components/plugins.gypi @@ -5,37 +5,55 @@ { 'targets': [ { - # GN version: //components/plugins/renderer - 'target_name': 'plugins_renderer', + # GN version: //components/plugins/common + 'target_name': 'plugins_common', 'type': 'static_library', - 'dependencies': [ - '../gin/gin.gyp:gin', - '../skia/skia.gyp:skia', - '../third_party/WebKit/public/blink.gyp:blink', - '../third_party/re2/re2.gyp:re2', - '../v8/tools/gyp/v8.gyp:v8', - ], 'include_dirs': [ '..', ], 'sources': [ - # Note: sources list duplicated in GN build. - 'plugins/renderer/loadable_plugin_placeholder.cc', - 'plugins/renderer/loadable_plugin_placeholder.h', - 'plugins/renderer/plugin_placeholder.cc', - 'plugins/renderer/plugin_placeholder.h', - 'plugins/renderer/webview_plugin.cc', - 'plugins/renderer/webview_plugin.h', + 'plugins/common/plugins_switches.cc', + 'plugins/common/plugins_switches.h', ], - 'conditions' : [ - ['OS=="android"', { + }, + ], + 'conditions': [ + ['OS!="ios"', { + 'targets': [ + { + # GN version: //components/plugins/renderer + 'target_name': 'plugins_renderer', + 'type': 'static_library', + 'dependencies': [ + '../gin/gin.gyp:gin', + '../skia/skia.gyp:skia', + '../third_party/WebKit/public/blink.gyp:blink', + '../third_party/re2/re2.gyp:re2', + '../v8/tools/gyp/v8.gyp:v8', + ], + 'include_dirs': [ + '..', + ], 'sources': [ # Note: sources list duplicated in GN build. - 'plugins/renderer/mobile_youtube_plugin.cc', - 'plugins/renderer/mobile_youtube_plugin.h', - ] - }], + 'plugins/renderer/loadable_plugin_placeholder.cc', + 'plugins/renderer/loadable_plugin_placeholder.h', + 'plugins/renderer/plugin_placeholder.cc', + 'plugins/renderer/plugin_placeholder.h', + 'plugins/renderer/webview_plugin.cc', + 'plugins/renderer/webview_plugin.h', + ], + 'conditions' : [ + ['OS=="android"', { + 'sources': [ + # Note: sources list duplicated in GN build. + 'plugins/renderer/mobile_youtube_plugin.cc', + 'plugins/renderer/mobile_youtube_plugin.h', + ] + }], + ], + }, ], - }, - ] + }], + ], } |