Allows extension-devtools api to survive page navigation.

chrome/browser/extensions/extension_devtools_bridge.cc

 // Copyright (c) 2009 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 "chrome/browser/extensions/extension_devtools_bridge.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_devtools_events.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/devtools_messages.h"
 
 ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
                                                  Profile* profile)
     : tab_id_(tab_id),
-      inspected_rvh_(NULL),
       profile_(profile),
       on_page_event_name_(
           ExtensionDevToolsEvents::OnPageEventNameForTab(tab_id)),
       on_tab_close_event_name_(
           ExtensionDevToolsEvents::OnTabCloseEventNameForTab(tab_id)) {
   extension_devtools_manager_ = profile_->GetExtensionDevToolsManager();
   DCHECK(extension_devtools_manager_.get());
 }
 
 ExtensionDevToolsBridge::~ExtensionDevToolsBridge() {
 }
 
 bool ExtensionDevToolsBridge::RegisterAsDevToolsClientHost() {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   Browser* browser;
   TabStripModel* tab_strip;
   TabContents* contents;
   int tab_index;
   if (ExtensionTabUtil::GetTabById(tab_id_, profile_, &browser, &tab_strip,
                                    &contents, &tab_index)) {
-    inspected_rvh_ = contents->render_view_host();
     DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
     devtools_manager->RegisterDevToolsClientHostFor(
-        inspected_rvh_, this);
+        contents->render_view_host(), this);
     devtools_manager->ForwardToDevToolsAgent(
         this,
         DevToolsAgentMsg_SetApuAgentEnabled(true));
     return true;
   }
   return false;
 }
 
 void ExtensionDevToolsBridge::UnregisterAsDevToolsClientHost() {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
-  if (inspected_rvh_) {
-    DevToolsManager::GetInstance()->UnregisterDevToolsClientHostFor(
-        inspected_rvh_);
-    inspected_rvh_ = NULL;
-  }
+  NotifyCloseListener();
 }
 
 // If the tab we are looking at is going away then we fire a closing event at
 // the extension.
 void ExtensionDevToolsBridge::InspectedTabClosing() {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   // TODO(knorton): Remove this event in favor of the standard tabs.onRemoved
   // event in extensions.
   std::string json("[{}]");
@@ skipping 22 matching lines @@
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   if (class_name == kApuAgentClassName
       && message_name == kApuPageEventMessageName) {
     std::string json = StringPrintf("[%s]", param1.c_str());
     profile_->GetExtensionMessageService()->DispatchEventToRenderers(
         on_page_event_name_, json);
   }
 }