diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-03 03:50:43 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-03 03:50:43 +0000 |
| commit | a28e330b65700730066cecffafecbb11742ede2c (patch) | |
| tree | ecd62d5761eee7dd3fc8902a476b8f66ec0f4f7e /content/browser/webui | |
| parent | a9dfd3d2dac6bcca200e2930fa67ca8af4568f62 (diff) | |
| download | chromium_src-a28e330b65700730066cecffafecbb11742ede2c.zip chromium_src-a28e330b65700730066cecffafecbb11742ede2c.tar.gz chromium_src-a28e330b65700730066cecffafecbb11742ede2c.tar.bz2 | |
Revert 180282 (doesn't build without reverting r180071 too, so let's just
disable the test for now.)
> Revert 180055: Very likely caused http://crbug.com/173885
> > Moving chrome://tracing to content.
> >
> > BUG=169170
> > Review URL: https://codereview.chromium.org/12088099
>
> TBR=jam@chromium.org
> Review URL: https://codereview.chromium.org/12194007
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/12197003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui')
| -rw-r--r-- | content/browser/webui/content_web_ui_controller_factory.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/webui/content_web_ui_controller_factory.cc b/content/browser/webui/content_web_ui_controller_factory.cc index c55ba1a..38a5de4 100644 --- a/content/browser/webui/content_web_ui_controller_factory.cc +++ b/content/browser/webui/content_web_ui_controller_factory.cc @@ -7,6 +7,7 @@ #include "content/browser/gpu/gpu_internals_ui.h" #include "content/browser/media/media_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" @@ -16,6 +17,9 @@ namespace content { 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 || url.host() == chrome::kChromeUIMediaInternalsHost) { return const_cast<ContentWebUIControllerFactory*>(this); @@ -41,6 +45,10 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL( return new GpuInternalsUI(web_ui); if (url.host() == chrome::kChromeUIMediaInternalsHost) return new MediaInternalsUI(web_ui); +#if !defined(OS_ANDROID) + if (url.host() == chrome::kChromeUITracingHost) + return new TracingUI(web_ui); +#endif return NULL; } |