Chromium Code Reviews| 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 7c2d8118ed8b869d9d63a2492d18a2a8a1b00503..fcda9be36acafe4443591aa7e43f930247509cdf 100644 |
| --- a/chrome/browser/plugins/flash_download_interception.cc |
| +++ b/chrome/browser/plugins/flash_download_interception.cc |
| @@ -20,6 +20,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; |
| @@ -64,7 +65,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); |
|
nasko
2016/09/30 20:38:48
Just FYI, this is a lossy conversion. For about:bl
tommycli
2016/09/30 21:20:41
Yes, that's perfect! :)
We want to BLOCK flash on
|
| flash_setting = PluginsFieldTrial::EffectiveContentSetting( |
| CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting); |