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/components.gyp | |
| 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/components.gyp')
| -rw-r--r-- | components/components.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/components.gyp b/components/components.gyp index d6c5e0a8..c5c752d 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -49,6 +49,7 @@ 'ownership.gypi', 'packed_ct_ev_whitelist.gypi', 'password_manager.gypi', + 'plugins.gypi', 'policy.gypi', 'precache.gypi', 'pref_registry.gypi', @@ -88,7 +89,6 @@ 'browsing_data.gypi', 'cdm.gypi', 'navigation_interception.gypi', - 'plugins.gypi', 'power.gypi', 'visitedlink.gypi', 'web_cache.gypi', |