Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4776)

Unified Diff: chrome/browser/extensions/extension_devtools_bridge.cc

Issue 8549022: Define DevTools content API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DevToolsManager -> DevToolsManagerImpl, moved client to public 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
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..ef6987e7e3dea54a623b13136f3c6ab133bad62b 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -15,9 +15,14 @@
#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::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsManager;
ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
Profile* profile)
@@ -56,12 +61,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.

Powered by Google App Engine
This is Rietveld 408576698