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

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

Issue 9689058: Disable chrome://downloads ui for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8655a32b6bc224dbd85b566548e8075deb2ea20a 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,6 +229,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui,
* OS Specific #defines
***************************************************************************/
#if !defined(OS_ANDROID)
+ // Android uses the native download manager
Evan Stade 2012/03/14 21:13:40 . at end of this comment.
+ if (url.host() == chrome::kChromeUIDownloadsHost)
+ return &NewWebUI<DownloadsUI>;
+
Evan Stade 2012/03/14 21:13:40 no newline
// Android doesn't use the Options/Options2 pages
Evan Stade 2012/03/14 21:13:40 . here too.
if (url.host() == chrome::kChromeUISettingsFrameHost)
return &NewWebUI<options2::OptionsUI>;
@@ -476,9 +478,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 +491,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();
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698