content/browser/debugger/devtools_manager.cc - Issue 8572010: DevTools: reattach to previous RVH when pending navigation is being canceled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/debugger/devtools_manager.cc

Issue 8572010: DevTools: reattach to previous RVH when pending navigation is being canceled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added test Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/debugger/devtools_manager.h ('k') | content/browser/debugger/devtools_manager_unittest.cc » ('j') | content/browser/tab_contents/render_view_host_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/debugger/devtools_manager.cc

diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc

index 82a7c0904c0f7b1ef0006bb412170e26d0cea944..11b661f95c76a0bf69b400d8d3b8ba9a6a81729f 100644

--- a/content/browser/debugger/devtools_manager.cc

+++ b/content/browser/debugger/devtools_manager.cc

@@ -160,6 +160,15 @@ void DevToolsManager::OnNavigatingToPendingEntry(RenderViewHost* rvh,

}

+void DevToolsManager::OnCancelPendingNavigation(RenderViewHost* pending,

+ RenderViewHost* current) {

+ int cookie = DetachClientHost(pending);

+ if (cookie != -1) {

+ // Navigating to URL in the inspected window.

+ AttachClientHost(cookie, current);

+ }

void DevToolsManager::TabReplaced(TabContents* old_tab,

TabContents* new_tab) {

RenderViewHost* old_rvh = old_tab->render_view_host();