diff --git a/atom/browser/api/atom_api_browser_window.cc b/atom/browser/api/atom_api_browser_window.cc index 75aa47646993..c640ea282414 100644 --- a/atom/browser/api/atom_api_browser_window.cc +++ b/atom/browser/api/atom_api_browser_window.cc @@ -155,7 +155,7 @@ void BrowserWindow::BeforeUnloadDialogCancelled() { window_unresponsive_closure_.Cancel(); } -void BrowserWindow::OnRendererUnresponsive(content::RenderWidgetHost*) { +void BrowserWindow::OnRendererUnresponsive(content::RenderProcessHost*) { // Schedule the unresponsive shortly later, since we may receive the // responsive event soon. This could happen after the whole application had // blocked for a while. diff --git a/atom/browser/api/atom_api_browser_window.h b/atom/browser/api/atom_api_browser_window.h index 37a8a4868dfb..6bf6585e3705 100644 --- a/atom/browser/api/atom_api_browser_window.h +++ b/atom/browser/api/atom_api_browser_window.h @@ -49,7 +49,7 @@ class BrowserWindow : public TopLevelWindow, void RenderViewCreated(content::RenderViewHost* render_view_host) override; void DidFirstVisuallyNonEmptyPaint() override; void BeforeUnloadDialogCancelled() override; - void OnRendererUnresponsive(content::RenderWidgetHost*) override; + void OnRendererUnresponsive(content::RenderProcessHost*) override; bool OnMessageReceived(const IPC::Message& message, content::RenderFrameHost* rfh) override; diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index e15db60eb623..dc8ae6d801d9 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -699,11 +699,13 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) { void WebContents::RendererUnresponsive( content::WebContents* source, - const content::WebContentsUnresponsiveState& unresponsive_state) { + content::RenderWidgetHost* render_widget_host) { Emit("unresponsive"); } -void WebContents::RendererResponsive(content::WebContents* source) { +void WebContents::RendererResponsive( + content::WebContents* source, + content::RenderWidgetHost* render_widget_host) { Emit("responsive"); for (ExtendedWebContentsObserver& observer : observers_) observer.OnRendererResponsive(); diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 186a7c288e51..707b3ad07bc3 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -310,8 +310,10 @@ class WebContents : public mate::TrackableObject, void ExitFullscreenModeForTab(content::WebContents* source) override; void RendererUnresponsive( content::WebContents* source, - const content::WebContentsUnresponsiveState& unresponsive_state) override; - void RendererResponsive(content::WebContents* source) override; + content::RenderWidgetHost* render_widget_host) override; + void RendererResponsive( + content::WebContents* source, + content::RenderWidgetHost* render_widget_host) override; bool HandleContextMenu(const content::ContextMenuParams& params) override; bool OnGoToEntryOffset(int offset) override; void FindReply(content::WebContents* web_contents,