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

Unified Diff: content/browser/webui/content_web_ui_controller_factory.cc

Issue 12088099: Moving chrome://tracing to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
« no previous file with comments | « content/browser/tracing/tracing_ui.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/content_web_ui_controller_factory.cc
===================================================================
--- content/browser/webui/content_web_ui_controller_factory.cc (revision 179949)
+++ content/browser/webui/content_web_ui_controller_factory.cc (working copy)
@@ -6,6 +6,7 @@
#include "content/browser/gpu/gpu_internals_ui.h"
#include "content/browser/media/webrtc_internals_ui.h"
+#include "content/browser/tracing/tracing_ui.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/common/url_constants.h"
@@ -15,6 +16,9 @@
WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType(
BrowserContext* browser_context, const GURL& url) const {
if (url.host() == chrome::kChromeUIWebRTCInternalsHost ||
+#if !defined(OS_ANDROID)
+ url.host() == chrome::kChromeUITracingHost ||
+#endif
url.host() == chrome::kChromeUIGpuHost) {
return const_cast<ContentWebUIControllerFactory*>(this);
}
@@ -37,6 +41,10 @@
return new WebRTCInternalsUI(web_ui);
if (url.host() == chrome::kChromeUIGpuHost)
return new GpuInternalsUI(web_ui);
+#if !defined(OS_ANDROID)
+ if (url.host() == chrome::kChromeUITracingHost)
+ return new TracingUI(web_ui);
+#endif
return NULL;
}
« no previous file with comments | « content/browser/tracing/tracing_ui.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698