Chromium Code Reviews| 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 93aee0b1d0e7f2667dced8d5b0538ecf212982e7..ca12157bb86a64a826357665cdd2615e6348acc6 100644 |
| --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
| +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
| @@ -196,8 +196,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) |
| @@ -242,6 +240,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>; |
|
Yaron
2012/04/09 18:31:54
Any reason not to add an exclusion for chrome/brow
Jerome
2012/04/09 20:10:52
Good point.
|
| #endif |
| #if defined(OS_WIN) |
| if (url.host() == chrome::kChromeUIConflictsHost) |
| @@ -498,10 +499,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; |
| } |