diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 22:01:54 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 22:01:54 +0000 |
| commit | 78c7977d2fc51cb7b24f1eb69e1bce64b71cb51a (patch) | |
| tree | 6175aad4900e5d8cecff970711c5c58dd436e44a /o3d/core/core.gyp | |
| parent | f6ee0a018e7b1f4ff5e63da7e8c388041acad2c3 (diff) | |
| download | chromium_src-78c7977d2fc51cb7b24f1eb69e1bce64b71cb51a.zip chromium_src-78c7977d2fc51cb7b24f1eb69e1bce64b71cb51a.tar.gz chromium_src-78c7977d2fc51cb7b24f1eb69e1bce64b71cb51a.tar.bz2 | |
Introduce two new GYP variables:
1) plugin_domain_whitelist, which sets an optional domain whitelist. If specified, websites not in the list can't use the plugin.
2) plugin_enable_fullscreen_msg, which can be optionally unset to disable the Win/Mac fullscreen message.
Also fix a bug in NPPluginProxy that this uncovered.
TEST=built on Windows with a whitelist and without fullscreen message and verified correct behaviour in both IE and FF. Also, the whitelist logic comes almost verbatim from another Google product where it is already well-tested
BUG=none
Review URL: http://codereview.chromium.org/668078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/core.gyp')
| -rw-r--r-- | o3d/core/core.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index a3e171a..d6c70cb 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -5,6 +5,8 @@ { 'variables': { 'chromium_code': 1, + # Whether to enable the English-only, Win/Mac-only fullscreen message. + 'plugin_enable_fullscreen_msg%': '1', }, 'target_defaults': { 'include_dirs': [ @@ -20,6 +22,13 @@ 'O3D_PLUGIN_VERSION="<!(python ../plugin/version_info.py --version)"', ], 'conditions': [ + ['<(plugin_enable_fullscreen_msg) != 0', + { + 'defines': [ + 'O3D_PLUGIN_ENABLE_FULLSCREEN_MSG=1', + ], + }, + ], ['OS == "win"', { 'msvs_settings': { |