diff options
| author | creis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 19:42:41 +0000 |
|---|---|---|
| committer | creis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 19:42:41 +0000 |
| commit | 528eba5b9d9f5d65d0df78312980fae6df69e4c4 (patch) | |
| tree | e661e5b6eeb4198605a0bc5182bf909dbcd66f13 /chrome/browser/renderer_host | |
| parent | 6688a4965904d54c252f563e0b0165232e28173c (diff) | |
| download | chromium_src-528eba5b9d9f5d65d0df78312980fae6df69e4c4.zip chromium_src-528eba5b9d9f5d65d0df78312980fae6df69e4c4.tar.gz chromium_src-528eba5b9d9f5d65d0df78312980fae6df69e4c4.tar.bz2 | |
Makes --disable-hang-monitor apply to navigations and closing tabs.
BUG=none
TEST=Pass --disable-hang-monitor and close a tab with a slow onunload event.
Review URL: http://codereview.chromium.org/3327011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 5c5ee42..a4c3d21 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -370,6 +370,11 @@ void RenderWidgetHost::DonePaintingToBackingStore() { } void RenderWidgetHost::StartHangMonitorTimeout(TimeDelta delay) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableHangMonitor)) { + return; + } + // If we already have a timer that will expire at or before the given delay, // then we have nothing more to do now. If we have set our end time to null // by calling StopHangMonitorTimeout, though, we will need to restart the |