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

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

Issue 2874663002: [subresource_filter] s/ShouldSuppressActivation/OnPageActivationComputed (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
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..92d4e7d3b4159c8bf58505def0ba0df62d72baaa 100644
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -116,12 +116,14 @@ void ChromeSubresourceFilterClient::ToggleNotificationVisibility(
}
}
-bool ChromeSubresourceFilterClient::ShouldSuppressActivation(
- content::NavigationHandle* navigation_handle) {
+bool ChromeSubresourceFilterClient::OnPageActivationComputed(
+ content::NavigationHandle* navigation_handle,
+ bool activated) {
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);
+ DCHECK(navigation_handle->IsInMainFrame());
+ // Return whether the activation should be whitelisted.
+ return whitelisted_hosts_.count(url.host()) ||
+ settings_manager_->GetSitePermission(url) == CONTENT_SETTING_BLOCK;
}
void ChromeSubresourceFilterClient::WhitelistByContentSettings(

Powered by Google App Engine
This is Rietveld 408576698