Chromium Code Reviews| 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..1c7e3b6ad8af9c2d651c6fd992430769ac80a559 100644 |
| --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
| +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
| @@ -23,7 +23,6 @@ |
| #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h" |
| #include "chrome/browser/ui/webui/extensions/extensions_ui.h" |
| #include "chrome/browser/ui/webui/feedback_ui.h" |
| -#include "chrome/browser/ui/webui/task_manager/task_manager_ui.h" |
| #include "chrome/browser/ui/webui/flags_ui.h" |
| #include "chrome/browser/ui/webui/flash_ui.h" |
| #include "chrome/browser/ui/webui/generic_handler.h" |
| @@ -87,6 +86,10 @@ |
| #include "chrome/browser/ui/webui/certificate_viewer_ui.h" |
| #endif |
| +#if defined(ENABLE_TASK_MANAGER) |
|
jam
2012/04/02 15:49:28
ditto
|
| +#include "chrome/browser/ui/webui/task_manager/task_manager_ui.h" |
| +#endif // defined(ENABLE_TASK_MANAGER) |
| + |
| using content::WebContents; |
| using content::WebUI; |
| using content::WebUIController; |
| @@ -209,8 +212,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 +287,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 +324,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 +340,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>; |
| } |