| Index: content/browser/renderer_host/render_view_host_impl.h
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
|
| index fece1e032e82f9997b5b2bcd6265e21712e65756..3efcb2499924cb59f0bd2877d7b11fc8c4d5bf6d 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.h
|
| +++ b/content/browser/renderer_host/render_view_host_impl.h
|
| @@ -36,6 +36,7 @@
|
| namespace content {
|
|
|
| struct FrameReplicationState;
|
| +class TimeoutMonitor;
|
|
|
| // This implements the RenderViewHost interface that is exposed to
|
| // embedders of content, and adds things only visible to content.
|
| @@ -252,11 +253,16 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane);
|
| FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest,
|
| CleanUpSwappedOutRVHOnProcessCrash);
|
| + FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest,
|
| + CloseWithPendingWhileUnresponsive);
|
| FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
|
| NavigateMainFrameToChildSite);
|
|
|
| void RenderViewReady();
|
|
|
| + // Called by |close_timeout_| when the page closing timeout fires.
|
| + void ClosePageTimeout();
|
| +
|
| // TODO(creis): Move to a private namespace on RenderFrameHostImpl.
|
| // Delay to wait on closing the WebContents for a beforeunload/unload handler
|
| // to fire.
|
| @@ -312,6 +318,8 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,
|
| // values depend on.
|
| std::unique_ptr<WebPreferences> web_preferences_;
|
|
|
| + std::unique_ptr<TimeoutMonitor> close_timeout_;
|
| +
|
| bool updating_web_preferences_;
|
|
|
| bool render_view_ready_on_process_launch_;
|
|
|