summaryrefslogtreecommitdiffstats
path: root/chrome/plugin/webplugin_proxy.h
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 17:14:59 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 17:14:59 +0000
commit6f23fd79add82e8b9d32a502a04c081f3525b5e6 (patch)
tree44b38348c2a9083c661f0a3c1160583f109f7d10 /chrome/plugin/webplugin_proxy.h
parent0b39289a3fd93eeb219fddb924e01210ac0baa1e (diff)
downloadchromium_src-6f23fd79add82e8b9d32a502a04c081f3525b5e6.zip
chromium_src-6f23fd79add82e8b9d32a502a04c081f3525b5e6.tar.gz
chromium_src-6f23fd79add82e8b9d32a502a04c081f3525b5e6.tar.bz2
linux: only create browser-side plugin container after plugin requests it
On Windows, windowed plugins are parented in a two-stage process: initially, the plugin is parented to the render view, then later it's reparented to a special per-plugin window. On Linux, plugin embedding always needs a special per-plugin window before it can be initialized. So there's no way to do the two-stage initialization process, and we only want to construct the browser-side plugin container for windowed plugins after the plugin requests it. Plumbing this through the WebPlugin interface will also allow us to side-route this request for window creation out to the browser process in the multi-process case. BUG=15421 TEST=plugins still work in test_shell Review URL: http://codereview.chromium.org/150034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/webplugin_proxy.h')
-rw-r--r--chrome/plugin/webplugin_proxy.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index e143297..c7bbe91 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -37,6 +37,11 @@ class WebPluginProxy : public WebPlugin {
~WebPluginProxy();
// WebPlugin overrides
+#if defined(OS_LINUX)
+ gfx::PluginWindowHandle CreatePluginContainer() {
+ return 0; // Temporary empty stub while we restructure test_shell.
+ }
+#endif
void SetWindow(gfx::PluginWindowHandle window);
void WillDestroyWindow(gfx::PluginWindowHandle window);
#if defined(OS_WIN)