summaryrefslogtreecommitdiffstats
path: root/content/browser/tab_contents/render_view_host_manager.cc
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 07:30:23 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 07:30:23 +0000
commitbfaf3605dd235bc06fb94c268614023e5a7fe5bd (patch)
tree279e281955bd8b65ed2296cba17e8c2803ade9cd /content/browser/tab_contents/render_view_host_manager.cc
parent9dfc681be07899cec20848a1294192980939c9c9 (diff)
downloadchromium_src-bfaf3605dd235bc06fb94c268614023e5a7fe5bd.zip
chromium_src-bfaf3605dd235bc06fb94c268614023e5a7fe5bd.tar.gz
chromium_src-bfaf3605dd235bc06fb94c268614023e5a7fe5bd.tar.bz2
DevTools: reattach to previous RVH when pending navigation is being canceled.
BUG=DevTools window may close when navigating to different bookmarked pages TEST=DevToolsManagerTest.ReattachOnCancelPendingNavigation Review URL: http://codereview.chromium.org/8572010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/render_view_host_manager.cc')
-rw-r--r--content/browser/tab_contents/render_view_host_manager.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 61b084b..593933a 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/logging.h"
+#include "content/browser/debugger/devtools_manager.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/render_view_host_factory.h"
@@ -746,6 +747,12 @@ void RenderViewHostManager::CancelPending() {
RenderViewHost* pending_render_view_host = pending_render_view_host_;
pending_render_view_host_ = NULL;
+ DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
+ if (devtools_manager) { // NULL in unit tests.
+ devtools_manager->OnCancelPendingNavigation(pending_render_view_host,
+ render_view_host_);
+ }
+
// We no longer need to prevent the process from exiting.
pending_render_view_host->process()->RemovePendingView();