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

Unified Diff: chrome/browser/plugins/flash_download_interception.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_download_interception.cc
diff --git a/chrome/browser/plugins/flash_download_interception.cc b/chrome/browser/plugins/flash_download_interception.cc
index d4f4944d31842c36295023671c21120c2c4c8b96..4c6805a425ec66cf00a318b1f344ae3f4a562503 100644
--- a/chrome/browser/plugins/flash_download_interception.cc
+++ b/chrome/browser/plugins/flash_download_interception.cc
@@ -21,6 +21,7 @@
#include "content/public/browser/permission_type.h"
#include "content/public/browser/web_contents.h"
#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
+#include "url/origin.h"
using content::BrowserThread;
using content::NavigationHandle;
@@ -54,7 +55,7 @@ void FlashDownloadInterception::InterceptFlashDownloadNavigation(
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(profile);
ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
- host_content_settings_map, source_url, source_url, nullptr);
+ host_content_settings_map, url::Origin(source_url), source_url, nullptr);
flash_setting = PluginsFieldTrial::EffectiveContentSetting(
CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
@@ -89,7 +90,7 @@ bool FlashDownloadInterception::ShouldStopFlashDownloadAction(
}
ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
- host_content_settings_map, source_url, source_url, nullptr);
+ host_content_settings_map, url::Origin(source_url), source_url, nullptr);
flash_setting = PluginsFieldTrial::EffectiveContentSetting(
CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);

Powered by Google App Engine
This is Rietveld 408576698