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

Unified Diff: content/browser/debugger/devtools_window.cc

Issue 7309011: Remove dependencies on extensions from content/browser/debugger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 9 years, 5 months 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: content/browser/debugger/devtools_window.cc
diff --git a/content/browser/debugger/devtools_window.cc b/content/browser/debugger/devtools_window.cc
index 1b3ad5e19f1c38ddacad39a9b72df677a7c137d4..8624e8edb99304b965efdf62ecfaebc0204a28e5 100644
--- a/content/browser/debugger/devtools_window.cc
+++ b/content/browser/debugger/devtools_window.cc
@@ -9,7 +9,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"
@@ -24,6 +23,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.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"
@@ -34,6 +34,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"
@@ -303,23 +304,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);
}

Powered by Google App Engine
This is Rietveld 408576698