| Index: chrome/browser/extensions/extension_devtools_bridge.cc
|
| diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
|
| index 8bcc4522ee7531aba5426330069e14282496ad84..af191a02a03c434d269b0c1dbf6c86468a3f1a7a 100644
|
| --- a/chrome/browser/extensions/extension_devtools_bridge.cc
|
| +++ b/chrome/browser/extensions/extension_devtools_bridge.cc
|
| @@ -15,9 +15,13 @@
|
| #include "chrome/browser/extensions/extension_tab_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| -#include "content/browser/debugger/devtools_manager.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/common/devtools_messages.h"
|
| +#include "content/public/browser/devtools/devtools_agent_host_registry.h"
|
| +#include "content/public/browser/devtools/devtools_manager.h"
|
| +
|
| +using content::DevToolsAgentHostRegistry;
|
| +using content::DevToolsManager;
|
|
|
| ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
|
| Profile* profile)
|
| @@ -56,12 +60,12 @@ bool ExtensionDevToolsBridge::RegisterAsDevToolsClientHost() {
|
| &browser, &tab_strip,
|
| &contents, &tab_index)) {
|
| DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
|
| - if (devtools_manager->GetDevToolsClientHostFor(contents->
|
| - render_view_host()) != NULL)
|
| + DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
|
| + contents->render_view_host());
|
| + if (devtools_manager->GetDevToolsClientHostFor(agent))
|
| return false;
|
|
|
| - devtools_manager->RegisterDevToolsClientHostFor(
|
| - contents->render_view_host(), this);
|
| + devtools_manager->RegisterDevToolsClientHostFor(agent, this);
|
|
|
| // Following messages depend on inspector protocol that is not yet
|
| // finalized.
|
|
|