Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8053)

Unified Diff: chrome/browser/plugins/plugin_utils.cc

Issue 2376603002: Add checks that ensure flash isn't exposed to a page if an enterprise ASK setting is in effect (Closed)
Patch Set: Add checks that ensure flash isn't exposed to a page if an enterprise ASK setting is in effect Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_utils.cc
diff --git a/chrome/browser/plugins/plugin_utils.cc b/chrome/browser/plugins/plugin_utils.cc
index 961931966073cd32cae64c53448b10caae105c37..582d098b1380424bcca1aa64cad2f0986093c9c5 100644
--- a/chrome/browser/plugins/plugin_utils.cc
+++ b/chrome/browser/plugins/plugin_utils.cc
@@ -87,10 +87,11 @@ void PluginUtils::GetPluginContentSetting(
ContentSetting PluginUtils::GetFlashPluginContentSetting(
const HostContentSettingsMap* host_content_settings_map,
const GURL& policy_url,
- const GURL& plugin_url) {
+ const GURL& plugin_url,
+ bool* is_managed) {
ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
GetPluginContentSettingInternal(
host_content_settings_map, false /* use_javascript_setting */, policy_url,
- plugin_url, kFlashPluginID, &plugin_setting, nullptr, nullptr);
+ plugin_url, kFlashPluginID, &plugin_setting, nullptr, is_managed);
return plugin_setting;
}
« no previous file with comments | « chrome/browser/plugins/plugin_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698