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

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 9701006: Don't build the task manager into Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve jam's commnents about not ifdef'ing includes Created 8 years, 9 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 | « chrome/browser/renderer_host/chrome_render_message_filter.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index cdc942b06db26e650f42355b9461bf37512d6150..d9a2d601ebddb715e4204ca5e889407b0185e6ab 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -209,8 +209,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
return &NewWebUI<SyncInternalsUI>;
if (url.host() == chrome::kChromeUISyncResourcesHost)
return &NewWebUI<HtmlDialogUI>;
- if (url.host() == chrome::kChromeUITaskManagerHost)
- return &NewWebUI<TaskManagerUI>;
if (url.host() == chrome::kChromeUITracingHost)
return &NewWebUI<TracingUI>;
if (url.host() == chrome::kChromeUIUberFrameHost)
@@ -286,6 +284,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
if (url.host() == chrome::kChromeUIPolicyHost)
return &NewWebUI<PolicyUI>;
#endif
+#if defined(ENABLE_TASK_MANAGER)
+ if (url.host() == chrome::kChromeUITaskManagerHost)
+ return &NewWebUI<TaskManagerUI>;
+#endif // defined(ENABLE_TASK_MANAGER)
#if defined(USE_VIRTUAL_KEYBOARD)
if (url.host() == chrome::kChromeUIKeyboardHost)
return &NewWebUI<KeyboardUI>;
@@ -319,7 +321,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
url.host() == chrome::kChromeUIMemoryHost ||
url.host() == chrome::kChromeUIMemoryRedirectHost ||
url.host() == chrome::kChromeUIStatsHost ||
- url.host() == chrome::kChromeUITaskManagerHost ||
url.host() == chrome::kChromeUITermsHost ||
url.host() == chrome::kChromeUIVersionHost
#if defined(USE_TCMALLOC)
@@ -336,6 +337,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
|| url.host() == chrome::kChromeUIOSCreditsHost
|| url.host() == chrome::kChromeUITransparencyHost
#endif
+#if defined(ENABLE_TASK_MANAGER)
+ || url.host() == chrome::kChromeUITaskManagerHost
+#endif
) {
return &NewWebUI<AboutUI>;
}
« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698