| commit | 5c97af5d08ecc190106f8576e6efe0b0053ebf03 | [log] [tgz] |
|---|---|---|
| author | Tommy Li <[email protected]> | Tue Oct 13 23:21:05 2020 |
| committer | Commit Bot <[email protected]> | Tue Oct 13 23:21:05 2020 |
| tree | 84a3c6a70cb505da3058ba0f5e609ba7cb8b4205 | |
| parent | 22206a7ce2c1ede52586bdc3286f7e691d95693f [diff] [blame] |
[flash] Update placeholder and infobar for deprecated plugin This CL updates the plugin placeholder and infobar for deprecated plugins. https://screenshot.googleplex.com/7PpXfrtEqRsusG9.png Bug: 1069833 Change-Id: Ie275afd376854a70b97dcba651aa70f8a57feb1e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466353 Reviewed-by: Joshua Pawlicki <[email protected]> Reviewed-by: Dominick Ng <[email protected]> Commit-Queue: Tommy Li <[email protected]> Cr-Commit-Position: refs/heads/master@{#816804}
diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc index 2194b17..dfe0681d 100644 --- a/chrome/browser/plugins/plugin_info_host_impl.cc +++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -233,6 +233,15 @@ return; } +// This block is separate from the outdated check, because the deprecated UI +// must take precedence over any content setting or HTML5 by Default. +#if BUILDFLAG(ENABLE_PLUGINS) + if (security_status == PluginMetadata::SECURITY_STATUS_DEPRECATED) { + *status = chrome::mojom::PluginStatus::kDeprecated; + return; + } +#endif + ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT; bool uses_default_content_setting = true; bool is_managed = false;
