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/plugin/cross/o3d_glue.h | |
| 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/plugin/cross/o3d_glue.h')
| -rw-r--r-- | o3d/plugin/cross/o3d_glue.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/o3d/plugin/cross/o3d_glue.h b/o3d/plugin/cross/o3d_glue.h index 7d72fee..8911804 100644 --- a/o3d/plugin/cross/o3d_glue.h +++ b/o3d/plugin/cross/o3d_glue.h @@ -226,6 +226,7 @@ class PluginObject: public NPObject { GdkEvent *configure); void SetDisplay(Display *display); #elif defined(OS_MACOSX) +#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG void SetFullscreenOverlayMacWindow(WindowRef window) { mac_fullscreen_overlay_window_ = window; } @@ -233,6 +234,7 @@ class PluginObject: public NPObject { WindowRef GetFullscreenOverlayMacWindow() { return mac_fullscreen_overlay_window_; } +#endif void SetFullscreenMacWindow(WindowRef window) { mac_fullscreen_window_ = window; @@ -269,13 +271,17 @@ class PluginObject: public NPObject { // Fullscreen related stuff. +#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG // FullscreenIdle gets repeatedly called while we are in fullscreen mode. // Currently its only task is to hide the fullscreen message at the right // time. void FullscreenIdle(); - double time_to_hide_overlay_; + double time_to_hide_overlay_; +#endif WindowRef mac_fullscreen_window_; // NULL if not in fullscreen modee +#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG WindowRef mac_fullscreen_overlay_window_; // NULL if not in fullscreen mode +#endif Ptr mac_fullscreen_state_; #endif // OS_MACOSX |