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

Side by Side 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, 2 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_utils.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/plugins/plugin_utils.h" 5 #include "chrome/browser/plugins/plugin_utils.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/common/plugin_utils.h" 8 #include "chrome/common/plugin_utils.h"
9 #include "components/content_settings/core/browser/host_content_settings_map.h" 9 #include "components/content_settings/core/browser/host_content_settings_map.h"
10 #include "content/public/common/webplugininfo.h" 10 #include "content/public/common/webplugininfo.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 GetPluginContentSettingInternal(host_content_settings_map, 80 GetPluginContentSettingInternal(host_content_settings_map,
81 ShouldUseJavaScriptSettingForPlugin(plugin), 81 ShouldUseJavaScriptSettingForPlugin(plugin),
82 policy_url, plugin_url, resource, setting, 82 policy_url, plugin_url, resource, setting,
83 uses_default_content_setting, is_managed); 83 uses_default_content_setting, is_managed);
84 } 84 }
85 85
86 // static 86 // static
87 ContentSetting PluginUtils::GetFlashPluginContentSetting( 87 ContentSetting PluginUtils::GetFlashPluginContentSetting(
88 const HostContentSettingsMap* host_content_settings_map, 88 const HostContentSettingsMap* host_content_settings_map,
89 const GURL& policy_url, 89 const GURL& policy_url,
90 const GURL& plugin_url) { 90 const GURL& plugin_url,
91 bool* is_managed) {
91 ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT; 92 ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
92 GetPluginContentSettingInternal( 93 GetPluginContentSettingInternal(
93 host_content_settings_map, false /* use_javascript_setting */, policy_url, 94 host_content_settings_map, false /* use_javascript_setting */, policy_url,
94 plugin_url, kFlashPluginID, &plugin_setting, nullptr, nullptr); 95 plugin_url, kFlashPluginID, &plugin_setting, nullptr, is_managed);
95 return plugin_setting; 96 return plugin_setting;
96 } 97 }
OLDNEW
« 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