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

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

Issue 10423006: Remove the web-ui task manager unused stuffs for non-ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove "webui_task_manager" and use "use_aura" instead. Created 8 years, 7 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/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 e5388102b8b29d8576b5f85a521ad3f7dacedde3..0acd25a2e86a7157dde608ddf7b562930177e0f9 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -278,10 +278,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
if (url.host() == chrome::kChromeUIPolicyHost)
return &NewWebUI<PolicyUI>;
#endif
-#if defined(ENABLE_TASK_MANAGER)
+#if defined(USE_AURA)
if (url.host() == chrome::kChromeUITaskManagerHost)
return &NewWebUI<TaskManagerUI>;
-#endif // defined(ENABLE_TASK_MANAGER)
+#endif // defined(USE_AURA)
#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
if (url.host() == chrome::kChromeUICollectedCookiesHost ||
@@ -324,7 +324,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|| url.host() == chrome::kChromeUIOSCreditsHost
|| url.host() == chrome::kChromeUITransparencyHost
#endif
-#if defined(ENABLE_TASK_MANAGER)
+#if defined(WEBUI_TASK_MANAGER)
|| url.host() == chrome::kChromeUITaskManagerHost
#endif
) {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/webui/task_manager/task_manager_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698