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

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

Issue 2378573005: [HBD] Blanket BLOCK on all non-HTTP(s) and non-FILE URLs for Flash. (Closed)
Patch Set: fix dat merge 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/plugins/plugin_utils.h
diff --git a/chrome/browser/plugins/plugin_utils.h b/chrome/browser/plugins/plugin_utils.h
index 3d1b691b86e5a5c982dd169053c6530093bfb73e..686eb2e20541a0a5e0986e714c018be4cb10d773 100644
--- a/chrome/browser/plugins/plugin_utils.h
+++ b/chrome/browser/plugins/plugin_utils.h
@@ -15,6 +15,10 @@ namespace content {
struct WebPluginInfo;
}
+namespace url {
+class Origin;
+}
+
class PluginUtils {
public:
// |is_default| and |is_managed| may be nullptr. In that case, they aren't
@@ -22,7 +26,7 @@ class PluginUtils {
static void GetPluginContentSetting(
const HostContentSettingsMap* host_content_settings_map,
const content::WebPluginInfo& plugin,
- const GURL& policy_url,
+ const url::Origin& main_frame_origin,
const GURL& plugin_url,
const std::string& resource,
ContentSetting* setting,
@@ -33,7 +37,7 @@ class PluginUtils {
// |GetPluginContentSetting| but flash-specific.
static ContentSetting GetFlashPluginContentSetting(
const HostContentSettingsMap* host_content_settings_map,
- const GURL& policy_url,
+ const url::Origin& main_frame_origin,
const GURL& plugin_url,
bool* is_managed);
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter_unittest.cc ('k') | chrome/browser/plugins/plugin_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698