diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 23:57:54 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 23:57:54 +0000 |
| commit | 9fa82bb8872a34275f3e0832f33339a4d07fa33b (patch) | |
| tree | c5bafa8a9d5f0cf931834ad750f909b17e4c9534 /chrome | |
| parent | 893a5ccce13082aa85686ad142c0d8be0fb5cd70 (diff) | |
| download | chromium_src-9fa82bb8872a34275f3e0832f33339a4d07fa33b.zip chromium_src-9fa82bb8872a34275f3e0832f33339a4d07fa33b.tar.gz chromium_src-9fa82bb8872a34275f3e0832f33339a4d07fa33b.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@19560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/plugin/webplugin_proxy.h | 5 |
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) |