diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 23:24:32 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 23:24:32 +0000 |
| commit | 3ebb3eb23535757d0525eec1dc903dd237571104 (patch) | |
| tree | 961b5616d23086ccc42bff031103b96c2c3ff145 /chrome/renderer | |
| parent | 54ff8593182da0591ecb2715bcf42aec51f4f3db (diff) | |
| download | chromium_src-3ebb3eb23535757d0525eec1dc903dd237571104.zip chromium_src-3ebb3eb23535757d0525eec1dc903dd237571104.tar.gz chromium_src-3ebb3eb23535757d0525eec1dc903dd237571104.tar.bz2 | |
Reverting 20683.
Review URL: http://codereview.chromium.org/155539
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 5 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 4 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 15d7771..436de6e 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -255,9 +255,8 @@ void RenderView::PluginDestroyed(WebPluginDelegateProxy* proxy) { first_default_plugin_ = NULL; } -void RenderView::PluginCrashed(base::ProcessId pid, - const FilePath& plugin_path) { - Send(new ViewHostMsg_CrashedPlugin(routing_id_, pid, plugin_path)); +void RenderView::PluginCrashed(const FilePath& plugin_path) { + Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path)); } diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 0b1a38a..ba6374d 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -325,8 +325,8 @@ class RenderView : public RenderWidget, // Called when a plugin is destroyed. void PluginDestroyed(WebPluginDelegateProxy* proxy); - // Called when a plugin has crashed. - void PluginCrashed(base::ProcessId pid, const FilePath& plugin_path); + // Called when a plugin is crashed. + void PluginCrashed(const FilePath& plugin_path); // Called from JavaScript window.external.AddSearchProvider() to add a // keyword for a provider described in the given OpenSearch document. diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index a5423ac..c723097 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -386,7 +386,7 @@ void WebPluginDelegateProxy::OnMessageReceived(const IPC::Message& msg) { void WebPluginDelegateProxy::OnChannelError() { if (plugin_) plugin_->Invalidate(); - render_view_->PluginCrashed(GetProcessId(), plugin_path_); + render_view_->PluginCrashed(plugin_path_); } void WebPluginDelegateProxy::UpdateGeometry( @@ -709,7 +709,7 @@ void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) { void WebPluginDelegateProxy::OnCreatePluginContainer( gfx::PluginWindowHandle* container) { RenderThread::current()->Send(new ViewHostMsg_CreatePluginContainer( - render_view_->routing_id(), GetProcessId(), container)); + render_view_->routing_id(), container)); } void WebPluginDelegateProxy::OnDestroyPluginContainer( |