Index: chrome/common/plugin_utils.cc |
diff --git a/chrome/common/plugin_utils.cc b/chrome/common/plugin_utils.cc |
index 63db43e7e565848f755e81cfa08bd66e5e69d6e3..e4f318856bf428803906fac86f323950cfb000e1 100644 |
--- a/chrome/common/plugin_utils.cc |
+++ b/chrome/common/plugin_utils.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/common/plugin_utils.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "content/public/common/content_constants.h" |
#include "content/public/common/webplugininfo.h" |
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
@@ -13,8 +14,8 @@ |
#endif |
bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) { |
- if (plugin.type != content::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS && |
- plugin.type != |
+ if (plugin.name == base::ASCIIToUTF16(content::kFlashPluginName) && |
+ plugin.type == |
content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) { |
xhwang
2016/09/26 23:44:51
how about in-process pepper, or it doesn't exist?
raymes
2016/09/27 01:31:18
There is no in-process flash. We want to make sure
tommycli
2016/09/27 18:51:07
Actually since it seems that PLUGINS is a stricter
|
return false; |
} |
@@ -34,5 +35,7 @@ bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) { |
} |
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) |
- return false; |
+ // Since all the UI surfaces for Plugin content settings display "Flash", |
+ // treat all other plugins (loaded only via command-line), as JavaScript. |
xhwang
2016/09/26 23:44:51
Do you mean "all other plugins that are loaded via
tommycli
2016/09/27 18:51:07
Done.
|
+ return true; |
} |