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); |
} |