diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 07:15:14 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 07:15:14 +0000 |
| commit | af9d8d32279a222e31e0e81ec9e6825764054787 (patch) | |
| tree | b037eb577531138d992f0db9a840f871e38d7e59 /chrome/browser/renderer_host | |
| parent | ea674b2231b9a813b0b73ef659c2861bdd18b83b (diff) | |
| download | chromium_src-af9d8d32279a222e31e0e81ec9e6825764054787.zip chromium_src-af9d8d32279a222e31e0e81ec9e6825764054787.tar.gz chromium_src-af9d8d32279a222e31e0e81ec9e6825764054787.tar.bz2 | |
linux: don't try to create plugin container if view_ is NULL
This can only happen for extensions with delay-initialized RenderWidgetHost.
BUG=28715
Review URL: http://codereview.chromium.org/450029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 7954a2d..4d40b83 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -885,11 +885,22 @@ void RenderWidgetHost::OnMsgImeUpdateStatus(int control, #if defined(OS_LINUX) void RenderWidgetHost::OnMsgCreatePluginContainer(gfx::PluginWindowHandle id) { - view_->CreatePluginContainer(id); + // TODO(piman): view_ can only be NULL with delayed view creation in + // extensions (see ExtensionHost::CreateRenderViewSoon). Figure out how to + // support plugins in that case. + if (view_) { + view_->CreatePluginContainer(id); + } else { + NOTIMPLEMENTED(); + } } void RenderWidgetHost::OnMsgDestroyPluginContainer(gfx::PluginWindowHandle id) { - view_->DestroyPluginContainer(id); + if (view_) { + view_->DestroyPluginContainer(id); + } else { + NOTIMPLEMENTED(); + } } #elif defined(OS_MACOSX) |