bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 55.0.2883.21

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-10-25 20:19:54 -04:00
parent c9e81c082f
commit 287664d85f
8 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libcef/browser/plugins/plugin_info_message_filter.cc
View File

@@ -312,7 +312,8 @@ void CefPluginInfoMessageFilter::Context::DecidePluginStatus(
// TODO(tommycli): Remove once we deprecate the plugin ASK policy.
bool legacy_ask_user = plugin_setting == CONTENT_SETTING_ASK;
plugin_setting = PluginsFieldTrial::EffectiveContentSetting(
CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
host_content_settings_map_, CONTENT_SETTINGS_TYPE_PLUGINS,
plugin_setting);
DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
DCHECK(plugin_setting != CONTENT_SETTING_ASK);