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

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

Issue 2378573005: [HBD] Blanket BLOCK on all non-HTTP(s) and non-FILE URLs for Flash. (Closed)
Patch Set: fix formatting Created 4 years, 3 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/chrome_plugin_service_filter.cc
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index 0e8783df8ea58aac46e3e845d72a4d4848df2718..15e4a066c99bbb95416f07b0acdaf6f77e15a779 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -28,7 +28,6 @@
#include "content/public/browser/resource_context.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_constants.h"
-#include "url/gurl.h"
using content::BrowserThread;
using content::PluginService;
@@ -167,7 +166,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
int render_frame_id,
const void* context,
const GURL& plugin_content_url,
- const GURL& main_url,
+ const url::Origin& main_url,
content::WebPluginInfo* plugin) {
base::AutoLock auto_lock(lock_);
const ProcessDetails* details = GetProcess(render_process_id);
@@ -225,7 +224,8 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
// This should only happen if the setting isn't being enforced by an
// enterprise policy.
if (is_managed ||
- SiteEngagementService::GetScoreFromSettings(settings_map, main_url) <
+ SiteEngagementService::GetScoreFromSettings(
+ settings_map, GURL(main_url.Serialize())) <
PluginsFieldTrial::GetSiteEngagementThresholdForFlash()) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698