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

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

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/flash_permission_context.cc
diff --git a/chrome/browser/plugins/flash_permission_context.cc b/chrome/browser/plugins/flash_permission_context.cc
index bb782a621a22d9bcc0f26811c8e46b7f3ff71df6..f3a80481b80a60b0c54bff7b22233699c6bf3392 100644
--- a/chrome/browser/plugins/flash_permission_context.cc
+++ b/chrome/browser/plugins/flash_permission_context.cc
@@ -13,6 +13,7 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
+#include "url/origin.h"
FlashPermissionContext::FlashPermissionContext(Profile* profile)
: PermissionContextBase(profile,
@@ -25,8 +26,8 @@ ContentSetting FlashPermissionContext::GetPermissionStatus(
const GURL& requesting_origin,
const GURL& embedding_origin) const {
ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
- HostContentSettingsMapFactory::GetForProfile(profile()), embedding_origin,
- requesting_origin, nullptr);
+ HostContentSettingsMapFactory::GetForProfile(profile()),
+ url::Origin(embedding_origin), requesting_origin, nullptr);
flash_setting = PluginsFieldTrial::EffectiveContentSetting(
CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)
« no previous file with comments | « chrome/browser/plugins/flash_download_interception_unittest.cc ('k') | chrome/browser/plugins/plugin_info_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698