DevTools: reattach to previous RVH when pending navigation is being canceled

content/browser/debugger/devtools_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/debugger/devtools_manager.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 142 matching lines @@
   int cookie = DetachClientHost(rvh);
   if (cookie != -1) {
     // Navigating to URL in the inspected window.
     AttachClientHost(cookie, dest_rvh);
 
     DevToolsClientHost* client_host = GetDevToolsClientHostFor(dest_rvh);
     client_host->FrameNavigating(gurl.spec());
   }
 }
 
+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();
   DevToolsClientHost* client_host = GetDevToolsClientHostFor(old_rvh);
   if (!client_host)
     return;  // Didn't know about old_tab.
   int cookie = DetachClientHost(old_rvh);
   if (cookie == -1)
     return;  // Didn't know about old_tab.
 
@@ skipping 106 matching lines @@
   for (AgentToClientHostMap::iterator it =
            agent_to_client_host_.begin();
        it != agent_to_client_host_.end(); ++it) {
     agents.push_back(it->first);
   }
   for (std::vector<DevToolsAgentHost*>::iterator it = agents.begin();
        it != agents.end(); ++it) {
     UnregisterDevToolsClientHostFor(*it);
   }
 }