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

Unified Diff: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

Issue 2716493004: Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument (Closed)
Patch Set: Rebased Created 3 years, 9 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: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
index 7711de302b38347e3e9d3fc2d2e89c4e701629c7..bad7b5aa163aa2c983ceff1f928ce6c245d420a1 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
@@ -200,7 +200,8 @@ void ContentSubresourceFilterDriverFactory::ResetActivationState() {
void ContentSubresourceFilterDriverFactory::DidStartNavigation(
content::NavigationHandle* navigation_handle) {
- if (navigation_handle->IsInMainFrame() && !navigation_handle->IsSamePage()) {
+ if (navigation_handle->IsInMainFrame() &&
+ !navigation_handle->IsSameDocument()) {
activation_decision_ = ActivationDecision::UNKNOWN;
ResetActivationState();
navigation_chain_.push_back(navigation_handle->GetURL());
@@ -210,14 +211,14 @@ void ContentSubresourceFilterDriverFactory::DidStartNavigation(
void ContentSubresourceFilterDriverFactory::DidRedirectNavigation(
content::NavigationHandle* navigation_handle) {
- DCHECK(!navigation_handle->IsSamePage());
+ DCHECK(!navigation_handle->IsSameDocument());
if (navigation_handle->IsInMainFrame())
navigation_chain_.push_back(navigation_handle->GetURL());
}
void ContentSubresourceFilterDriverFactory::ReadyToCommitNavigation(
content::NavigationHandle* navigation_handle) {
- DCHECK(!navigation_handle->IsSamePage());
+ DCHECK(!navigation_handle->IsSameDocument());
// ReadyToCommitNavigation with browser-side navigation disabled is not called
// in production code for failed navigations (e.g. network errors). We don't

Powered by Google App Engine
This is Rietveld 408576698