Skip to content

Commit

Permalink
Fix how we detect renderer crash.
Browse files Browse the repository at this point in the history
  • Loading branch information
zcbenz committed Jul 18, 2013
1 parent 36f125f commit 4ddd1bc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
11 changes: 4 additions & 7 deletions browser/native_window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,6 @@ void NativeWindow::RendererResponsive(content::WebContents* source) {
FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererResponsive());
}

void NativeWindow::NavigationStateChanged(const content::WebContents* source,
unsigned changed_flags) {
if (changed_flags == content::INVALIDATE_TYPE_TAB &&
source->IsCrashed())
FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererCrashed());
}

bool NativeWindow::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(NativeWindow, message)
Expand All @@ -291,6 +284,10 @@ bool NativeWindow::OnMessageReceived(const IPC::Message& message) {
return handled;
}

void NativeWindow::RenderViewGone(base::TerminationStatus status) {
FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererCrashed());
}

void NativeWindow::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
Expand Down
3 changes: 1 addition & 2 deletions browser/native_window.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,9 @@ class NativeWindow : public content::WebContentsDelegate,
const content::WebContents* source) const OVERRIDE;
virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
virtual void NavigationStateChanged(const content::WebContents* source,
unsigned changed_flags) OVERRIDE;

// Implementations of content::WebContentsObserver.
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;

// Implementations of content::NotificationObserver
Expand Down

0 comments on commit 4ddd1bc

Please sign in to comment.