| 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 0e8c4bcb0798a299125f21e6e0998d48c3152e0c..c228d87999da52dac53ce71e9ff088d9b0267e19 100644
|
| --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| @@ -180,8 +180,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
|
| return &NewWebUI<DevToolsUI>;
|
| if (url.host() == chrome::kChromeUIDialogHost)
|
| return &NewWebUI<ConstrainedHtmlUI>;
|
| - if (url.host() == chrome::kChromeUIDownloadsHost)
|
| - return &NewWebUI<DownloadsUI>;
|
| if (url.host() == chrome::kChromeUIExtensionsFrameHost)
|
| return &NewWebUI<ExtensionsUI>;
|
| if (url.host() == chrome::kChromeUIFeedbackHost)
|
| @@ -231,7 +229,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
|
| * OS Specific #defines
|
| ***************************************************************************/
|
| #if !defined(OS_ANDROID)
|
| - // Android doesn't use the Options/Options2 pages
|
| + // Android uses the native download manager.
|
| + if (url.host() == chrome::kChromeUIDownloadsHost)
|
| + return &NewWebUI<DownloadsUI>;
|
| + // Android doesn't use the Options/Options2 pages.
|
| if (url.host() == chrome::kChromeUISettingsFrameHost)
|
| return &NewWebUI<options2::OptionsUI>;
|
| if (url.host() == chrome::kChromeUISettingsHost)
|
| @@ -476,9 +477,6 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
|
| if (page_url.host() == chrome::kChromeUICrashesHost)
|
| return CrashesUI::GetFaviconResourceBytes();
|
|
|
| - if (page_url.host() == chrome::kChromeUIDownloadsHost)
|
| - return DownloadsUI::GetFaviconResourceBytes();
|
| -
|
| if (page_url.host() == chrome::kChromeUIHistoryHost)
|
| return HistoryUI::GetFaviconResourceBytes();
|
|
|
| @@ -492,6 +490,10 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
|
| return FlashUI::GetFaviconResourceBytes();
|
|
|
| #if !defined(OS_ANDROID)
|
| + // Android uses the native download manager
|
| + if (page_url.host() == chrome::kChromeUIDownloadsHost)
|
| + return DownloadsUI::GetFaviconResourceBytes();
|
| +
|
| // Android doesn't use the Options/Options2 pages
|
| if (page_url.host() == chrome::kChromeUISettingsHost)
|
| return OptionsUI::GetFaviconResourceBytes();
|
|
|