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

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

Issue 2874663002: [subresource_filter] s/ShouldSuppressActivation/OnPageActivationComputed (Closed)
Patch Set: engedy review 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 c8e2adb204f8bafac37ba8bc951a8c86c141640e..dae4531414067a6a9f1d3cfb33f7e5828bbc7c97 100644
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -116,10 +116,13 @@ 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() &&
+ DCHECK(navigation_handle->IsInMainFrame());
+ // Return whether the activation should be whitelisted.
+ return activated &&
(whitelisted_hosts_.find(url.host()) != whitelisted_hosts_.end() ||
settings_manager_->GetSitePermission(url) == CONTENT_SETTING_BLOCK);
}

Powered by Google App Engine
This is Rietveld 408576698