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..ced3ae8528030aeefde6c8532aa0f801b3b4e40d 100644 |
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
@@ -197,8 +197,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui, |
return &NewWebUI<NetworkActionPredictorUI>; |
if (url.host() == chrome::kChromeUIOmniboxHost) |
return &NewWebUI<OmniboxUI>; |
- if (url.host() == chrome::kChromeUIPluginsHost) |
- return &NewWebUI<PluginsUI>; |
if (url.host() == chrome::kChromeUIProfilerHost) |
return &NewWebUI<ProfilerUI>; |
if (url.host() == chrome::kChromeUIQuotaInternalsHost) |
@@ -245,6 +243,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(content::WebUI* web_ui, |
prefs::kPrintPreviewDisabled)) { |
return &NewWebUI<PrintPreviewUI>; |
} |
+ // Android does not support plugins for now. |
+ if (url.host() == chrome::kChromeUIPluginsHost) |
+ return &NewWebUI<PluginsUI>; |
#endif |
#if defined(OS_WIN) |
if (url.host() == chrome::kChromeUIConflictsHost) |
@@ -495,10 +496,11 @@ RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( |
// Android doesn't use the Options pages. |
if (page_url.host() == chrome::kChromeUISettingsFrameHost) |
return options2::OptionsUI::GetFaviconResourceBytes(); |
-#endif |
+ // Android doesn't use the plugins pages. |
if (page_url.host() == chrome::kChromeUIPluginsHost) |
return PluginsUI::GetFaviconResourceBytes(); |
+#endif |
return NULL; |
} |