| 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 a0e412665720c6fde5e34510f7add55424dc826b..a150f14560cb2c763e27dc5f7907c30bc317ef08 100644
|
| --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| @@ -383,9 +383,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
| // Downloads list on Android uses the built-in download manager.
|
| if (url.host() == chrome::kChromeUIDownloadsHost)
|
| return &NewWebUI<DownloadsUI>;
|
| - // Flash is not available on android.
|
| - if (url.host() == chrome::kChromeUIFlashHost)
|
| - return &NewWebUI<FlashUI>;
|
| if (url.host() == chrome::kChromeUIGCMInternalsHost)
|
| return &NewWebUI<GCMInternalsUI>;
|
| // Help is implemented with native UI elements on Android.
|
| @@ -400,9 +397,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
| ::switches::MdSettingsEnabled()) {
|
| return &NewWebUI<settings::MdSettingsUI>;
|
| }
|
| - // Android does not support plugins for now.
|
| - if (url.host() == chrome::kChromeUIPluginsHost)
|
| - return &NewWebUI<PluginsUI>;
|
| if (url.host() == chrome::kChromeUIQuotaInternalsHost)
|
| return &NewWebUI<QuotaInternalsUI>;
|
| // Settings are implemented with native UI elements on Android.
|
| @@ -548,6 +542,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
| if (url.host() == chrome::kChromeUIExtensionsFrameHost)
|
| return &NewWebUI<extensions::ExtensionsUI>;
|
| #endif
|
| +#if defined(ENABLE_PLUGINS)
|
| + if (url.host() == chrome::kChromeUIFlashHost)
|
| + return &NewWebUI<FlashUI>;
|
| + if (url.host() == chrome::kChromeUIPluginsHost)
|
| + return &NewWebUI<PluginsUI>;
|
| +#endif
|
| #if defined(ENABLE_PRINT_PREVIEW)
|
| if (url.host() == chrome::kChromeUIPrintHost &&
|
| !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled)) {
|
|
|