Disable chrome://downloads ui for Android.

On Android we use the native download manager (and this is causing link
errors).

BUG=117407
TEST=


Review URL: http://codereview.chromium.org/9689058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126881 0039d316-1c4b-4281-b951-d872f2087c98
parent 5dc403e0
...@@ -179,8 +179,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui, ...@@ -179,8 +179,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
return &NewWebUI<DevToolsUI>; return &NewWebUI<DevToolsUI>;
if (url.host() == chrome::kChromeUIDialogHost) if (url.host() == chrome::kChromeUIDialogHost)
return &NewWebUI<ConstrainedHtmlUI>; return &NewWebUI<ConstrainedHtmlUI>;
if (url.host() == chrome::kChromeUIDownloadsHost)
return &NewWebUI<DownloadsUI>;
if (url.host() == chrome::kChromeUIExtensionsFrameHost) if (url.host() == chrome::kChromeUIExtensionsFrameHost)
return &NewWebUI<ExtensionsUI>; return &NewWebUI<ExtensionsUI>;
if (url.host() == chrome::kChromeUIFeedbackHost) if (url.host() == chrome::kChromeUIFeedbackHost)
...@@ -230,7 +228,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui, ...@@ -230,7 +228,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
* OS Specific #defines * OS Specific #defines
***************************************************************************/ ***************************************************************************/
#if !defined(OS_ANDROID) #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) if (url.host() == chrome::kChromeUISettingsFrameHost)
return &NewWebUI<options2::OptionsUI>; return &NewWebUI<options2::OptionsUI>;
if (url.host() == chrome::kChromeUISettingsHost) if (url.host() == chrome::kChromeUISettingsHost)
...@@ -473,9 +474,6 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( ...@@ -473,9 +474,6 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
if (page_url.host() == chrome::kChromeUICrashesHost) if (page_url.host() == chrome::kChromeUICrashesHost)
return CrashesUI::GetFaviconResourceBytes(); return CrashesUI::GetFaviconResourceBytes();
if (page_url.host() == chrome::kChromeUIDownloadsHost)
return DownloadsUI::GetFaviconResourceBytes();
if (page_url.host() == chrome::kChromeUIHistoryHost) if (page_url.host() == chrome::kChromeUIHistoryHost)
return HistoryUI::GetFaviconResourceBytes(); return HistoryUI::GetFaviconResourceBytes();
...@@ -489,6 +487,10 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( ...@@ -489,6 +487,10 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
return FlashUI::GetFaviconResourceBytes(); return FlashUI::GetFaviconResourceBytes();
#if !defined(OS_ANDROID) #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 // Android doesn't use the Options/Options2 pages
if (page_url.host() == chrome::kChromeUISettingsHost) if (page_url.host() == chrome::kChromeUISettingsHost)
return OptionsUI::GetFaviconResourceBytes(); return OptionsUI::GetFaviconResourceBytes();
......
...@@ -4467,6 +4467,7 @@ ...@@ -4467,6 +4467,7 @@
['exclude', '^browser/ui/panels/'], ['exclude', '^browser/ui/panels/'],
['exclude', '^browser/ui/tabs/'], ['exclude', '^browser/ui/tabs/'],
['exclude', '^browser/ui/toolbar/'], ['exclude', '^browser/ui/toolbar/'],
['exclude', '^browser/ui/webui/downloads_'],
['exclude', '^browser/ui/webui/options'], ['exclude', '^browser/ui/webui/options'],
['exclude', '^browser/ui/webui/options2'], ['exclude', '^browser/ui/webui/options2'],
['exclude', '^browser/ui/webui/print_preview/'], ['exclude', '^browser/ui/webui/print_preview/'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment