Commit 2a835052 authored by fsamuel@chromium.org's avatar fsamuel@chromium.org

Remove BrowserPluginGuestDelegate::GuestProcessGone

BUG=364141, 330264

Review URL: https://codereview.chromium.org/297183010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273105 0039d316-1c4b-4281-b951-d872f2087c98
parent e98c9414
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "chrome/browser/guest_view/web_view/web_view_guest.h" #include "chrome/browser/guest_view/web_view/web_view_guest.h"
#include "base/debug/stack_trace.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
...@@ -430,17 +429,6 @@ void WebViewGuest::FindReply(WebContents* source, ...@@ -430,17 +429,6 @@ void WebViewGuest::FindReply(WebContents* source,
active_match_ordinal, final_update); active_match_ordinal, final_update);
} }
void WebViewGuest::GuestProcessGone(base::TerminationStatus status) {
// Cancel all find sessions in progress.
find_helper_.CancelAllFindSessions();
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
args->SetInteger(webview::kProcessId,
guest_web_contents()->GetRenderProcessHost()->GetID());
args->SetString(webview::kReason, TerminationStatusToString(status));
DispatchEvent(new GuestViewBase::Event(webview::kEventExit, args.Pass()));
}
void WebViewGuest::HandleKeyboardEvent( void WebViewGuest::HandleKeyboardEvent(
WebContents* source, WebContents* source,
const content::NativeWebKeyboardEvent& event) { const content::NativeWebKeyboardEvent& event) {
...@@ -876,6 +864,17 @@ bool WebViewGuest::OnMessageReceived(const IPC::Message& message, ...@@ -876,6 +864,17 @@ bool WebViewGuest::OnMessageReceived(const IPC::Message& message,
return handled; return handled;
} }
void WebViewGuest::RenderProcessGone(base::TerminationStatus status) {
// Cancel all find sessions in progress.
find_helper_.CancelAllFindSessions();
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
args->SetInteger(webview::kProcessId,
guest_web_contents()->GetRenderProcessHost()->GetID());
args->SetString(webview::kReason, TerminationStatusToString(status));
DispatchEvent(new GuestViewBase::Event(webview::kEventExit, args.Pass()));
}
void WebViewGuest::WebContentsDestroyed() { void WebViewGuest::WebContentsDestroyed() {
// Clean up custom context menu items for this guest. // Clean up custom context menu items for this guest.
extensions::MenuManager* menu_manager = extensions::MenuManager::Get( extensions::MenuManager* menu_manager = extensions::MenuManager::Get(
......
...@@ -129,7 +129,6 @@ class WebViewGuest : public GuestView<WebViewGuest>, ...@@ -129,7 +129,6 @@ class WebViewGuest : public GuestView<WebViewGuest>,
// GuestDelegate implementation. // GuestDelegate implementation.
virtual void DidAttach() OVERRIDE; virtual void DidAttach() OVERRIDE;
virtual void EmbedderDestroyed() OVERRIDE; virtual void EmbedderDestroyed() OVERRIDE;
virtual void GuestProcessGone(base::TerminationStatus status) OVERRIDE;
virtual bool IsDragAndDropEnabled() OVERRIDE; virtual bool IsDragAndDropEnabled() OVERRIDE;
virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size) virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size)
OVERRIDE; OVERRIDE;
...@@ -305,6 +304,7 @@ class WebViewGuest : public GuestView<WebViewGuest>, ...@@ -305,6 +304,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
virtual bool OnMessageReceived( virtual bool OnMessageReceived(
const IPC::Message& message, const IPC::Message& message,
content::RenderFrameHost* render_frame_host) OVERRIDE; content::RenderFrameHost* render_frame_host) OVERRIDE;
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE; virtual void WebContentsDestroyed() OVERRIDE;
virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE; virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE;
virtual void RenderViewReady() OVERRIDE; virtual void RenderViewReady() OVERRIDE;
......
...@@ -482,8 +482,6 @@ void BrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) { ...@@ -482,8 +482,6 @@ void BrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) {
default: default:
break; break;
} }
if (delegate_)
delegate_->GuestProcessGone(status);
} }
// static // static
......
...@@ -26,13 +26,6 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate { ...@@ -26,13 +26,6 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
// Notification that the embedder has completed attachment. // Notification that the embedder has completed attachment.
virtual void DidAttach() {} virtual void DidAttach() {}
// Informs the delegate that the guest render process is gone. |status|
// indicates whether the guest was killed, crashed, or was terminated
// gracefully.
// TODO(fsamuel): Delete this once BrowserPluginGuest is no longer a
// WebContentsDelegate.
virtual void GuestProcessGone(base::TerminationStatus status) {}
// Informs the delegate that the embedder has been destroyed. // Informs the delegate that the embedder has been destroyed.
virtual void EmbedderDestroyed() {} virtual void EmbedderDestroyed() {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment