Index: content/browser/debugger/devtools_window.cc |
diff --git a/content/browser/debugger/devtools_window.cc b/content/browser/debugger/devtools_window.cc |
index ba633243a70139c39ad1e464e43ead12f04f45bc..c72aa3555c8b799b797ba4775e9a1aa7378a83f7 100644 |
--- a/content/browser/debugger/devtools_window.cc |
+++ b/content/browser/debugger/devtools_window.cc |
@@ -11,7 +11,6 @@ |
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
#include "chrome/browser/browser_process.h" |
-#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/prefs/scoped_user_pref_update.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -27,6 +26,7 @@ |
#include "chrome/common/render_messages.h" |
#include "chrome/common/url_constants.h" |
#include "content/browser/browsing_instance.h" |
+#include "content/browser/content_browser_client.h" |
#include "content/browser/debugger/devtools_manager.h" |
#include "content/browser/debugger/devtools_window.h" |
#include "content/browser/in_process_webkit/session_storage_namespace.h" |
@@ -37,6 +37,7 @@ |
#include "content/browser/tab_contents/tab_contents.h" |
#include "content/browser/tab_contents/tab_contents_view.h" |
#include "content/common/bindings_policy.h" |
+#include "content/common/content_client.h" |
#include "content/common/notification_service.h" |
#include "grit/generated_resources.h" |
@@ -353,23 +354,8 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() { |
CallClientFunction(ASCIIToUTF16("WebInspector.setInspectedTabId"), tabId); |
} |
ListValue results; |
- const ExtensionService* extension_service = |
- tab_contents_->tab_contents()->profile()-> |
- GetOriginalProfile()->GetExtensionService(); |
- if (!extension_service) |
- return; |
- |
- const ExtensionList* extensions = extension_service->extensions(); |
- |
- for (ExtensionList::const_iterator extension = extensions->begin(); |
- extension != extensions->end(); ++extension) { |
- if ((*extension)->devtools_url().is_empty()) |
- continue; |
- DictionaryValue* extension_info = new DictionaryValue(); |
- extension_info->Set("startPage", |
- new StringValue((*extension)->devtools_url().spec())); |
- results.Append(extension_info); |
- } |
+ content::GetContentClient()->browser()->GetAdditionalStartPagesForDevTools( |
+ tab_contents_->tab_contents(), &results); |
CallClientFunction(ASCIIToUTF16("WebInspector.addExtensions"), results); |
} |