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

Unified Diff: chrome/browser/debugger/browser_list_tabcontents_provider.cc

Issue 9113079: DevTools: refactor remote debugging server to enable content_shell debugging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch for landing. Created 8 years, 11 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: chrome/browser/debugger/browser_list_tabcontents_provider.cc
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.cc b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
index ae02cd009b3aa14e426a69b80a4d4e1c40c34099..5461c44dfcb7d239079b55f483d5279f48bbcee5 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "grit/devtools_frontend_resources.h"
+#include "grit/devtools_discovery_page_resources.h"
#include "net/url_request/url_request_context_getter.h"
#include "ui/base/resource/resource_bundle.h"
@@ -28,7 +28,7 @@ BrowserListTabContentsProvider::GetInspectableTabs() {
std::string BrowserListTabContentsProvider::GetDiscoveryPageHTML() {
return ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_DEVTOOLS_FRONTEND_HTML).as_string();
+ IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
}
net::URLRequestContext*
@@ -37,3 +37,13 @@ BrowserListTabContentsProvider::GetURLRequestContext() {
Profile::Deprecated::GetDefaultRequestContext();
return getter ? getter->GetURLRequestContext() : NULL;
}
+
+bool BrowserListTabContentsProvider::BundlesFrontendResources() {
+ // We'd like front-end to be served from the WebUI via proxy, hence
+ // pretend we don't have it bundled.
+ return false;
+}
+
+std::string BrowserListTabContentsProvider::GetFrontendResourcesBaseURL() {
+ return "chrome-devtools://devtools/";
+}

Powered by Google App Engine
This is Rietveld 408576698