chrome/browser/subresource_filter/chrome_subresource_filter_client.cc - Issue 2877553002: [subresource_filter] Swap ALLOW and BLOCK meanings in the content setting

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

Issue 2877553002: [subresource_filter] Swap ALLOW and BLOCK meanings in the content setting (Closed)

Patch Set: Created 3 years, 7 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

« chrome/browser/subresource_filter/chrome_subresource_filter_client.h ('K') | « chrome/browser/subresource_filter/chrome_subresource_filter_client.h ('k') | chrome/browser/subresource_filter/subresource_filter_browsertest.cc » ('j') | components/content_settings/core/browser/content_settings_registry.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

index ab7d64f00fb53bd545ef1bc201c8a60050f31683..9ad2939d5a970d4320138ae749158a3a4faee9fa 100644

--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

@@ -121,7 +121,7 @@ bool ChromeSubresourceFilterClient::ShouldSuppressActivation(

const GURL& url(navigation_handle->GetURL());

return navigation_handle->IsInMainFrame() &&

(whitelisted_hosts_.find(url.host()) != whitelisted_hosts_.end() ||

- settings_manager_->GetSitePermission(url) == CONTENT_SETTING_BLOCK);

engedy 2017/05/11 10:39:37 My understanding is that users will not yet have a

Charlie Harrison 2017/05/11 14:05:44 Yes, this change should only affect builds that ha

+ settings_manager_->GetSitePermission(url) == CONTENT_SETTING_ALLOW);

}

void ChromeSubresourceFilterClient::WhitelistByContentSettings(