diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 00:13:45 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 00:13:45 +0000 |
| commit | 7ae1b97cae65107ca09124e98365e4de9ddec32d (patch) | |
| tree | 6194b8ce1c8c18da9fe5e4c54ec677cf40849277 /chrome/browser/render_view_host_manager.cc | |
| parent | ccd08da9000b33c0034ea3dd866decd531d2096f (diff) | |
| download | chromium_src-7ae1b97cae65107ca09124e98365e4de9ddec32d.zip chromium_src-7ae1b97cae65107ca09124e98365e4de9ddec32d.tar.gz chromium_src-7ae1b97cae65107ca09124e98365e4de9ddec32d.tar.bz2 | |
Attempt at fixing bug 5800.
When pressing back on an interstitial with a cross site navigation pending, we should cancel the pending without running the unload handler on the previous page.
BUG=5800
TEST=See bug.
Review URL: http://codereview.chromium.org/17061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/render_view_host_manager.cc')
| -rw-r--r-- | chrome/browser/render_view_host_manager.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/render_view_host_manager.cc b/chrome/browser/render_view_host_manager.cc index 5ad576b..c5e4d00 100644 --- a/chrome/browser/render_view_host_manager.cc +++ b/chrome/browser/render_view_host_manager.cc @@ -490,3 +490,10 @@ void RenderViewHostManager::CancelPendingRenderView() { pending_render_view_host_ = NULL; } +void RenderViewHostManager::CrossSiteNavigationCanceled() { + DCHECK(cross_navigation_pending_); + cross_navigation_pending_ = false; + if (pending_render_view_host_) + CancelPendingRenderView(); +} + |