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

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2759613003: Use SameDocument instead of SamePage term on iOS. (Closed)
Patch Set: Actually fixed tests 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
« no previous file with comments | « ios/web/web_state/navigation_context_impl_unittest.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index e23141e1fb0ba7a4916fff43a41a8033ca04ef90..d735546b7182aeb4e2acb3c62dd4bc474c4472da 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -1310,7 +1310,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
[[self sessionController] pushNewItemWithURL:pageURL
stateObject:stateObject
transition:transition];
- _webStateImpl->OnSamePageNavigation(pageURL);
+ _webStateImpl->OnSameDocumentNavigation(pageURL);
self.userInteractionRegistered = NO;
}
@@ -1318,7 +1318,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
stateObject:(NSString*)stateObject {
[[self sessionController] updateCurrentItemWithURL:pageURL
stateObject:stateObject];
- _webStateImpl->OnSamePageNavigation(pageURL);
+ _webStateImpl->OnSameDocumentNavigation(pageURL);
}
- (void)setDocumentURL:(const GURL&)newURL {
@@ -4732,7 +4732,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
[self setDocumentURL:webViewURL];
[self webPageChanged];
if (isSameDocumentNavigation) {
- _webStateImpl->OnSamePageNavigation(webViewURL);
+ _webStateImpl->OnSameDocumentNavigation(webViewURL);
} else {
_webStateImpl->OnNavigationCommitted(webViewURL);
}
@@ -4888,7 +4888,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
if (!_changingHistoryState) {
[self didStartLoadingURL:_documentURL];
- _webStateImpl->OnSamePageNavigation(newURL);
+ _webStateImpl->OnSameDocumentNavigation(newURL);
[self updateSSLStatusForCurrentNavigationItem];
[self didFinishNavigation];
}
« no previous file with comments | « ios/web/web_state/navigation_context_impl_unittest.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698