| 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>;
|
| }
|
|
|