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

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

Issue 2718733003: Removed -[CRWWebDelegate webDidUpdateHistoryStateWithPageURL]. (Closed)
Patch Set: Created 3 years, 10 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: 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 6d0fb2cfa2b052059efebef06219a0dee45a6672..05b1fa4a0b1b1142dbd63cd46a790302b73e03b7 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -746,8 +746,6 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
- (BOOL)isMainFrameNavigationAction:(WKNavigationAction*)action;
// Returns whether external URL navigation action should be opened.
- (BOOL)shouldOpenExternalURLForNavigationAction:(WKNavigationAction*)action;
-// Called when a page updates its history stack using pushState or replaceState.
-- (void)didUpdateHistoryStateWithPageURL:(const GURL&)url;
// Updates SSL status for the current navigation item based on the information
// provided by web view.
- (void)updateSSLStatusForCurrentNavigationItem;
@@ -1341,15 +1339,15 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
[[self sessionController] pushNewItemWithURL:pageURL
stateObject:stateObject
transition:transition];
- [self didUpdateHistoryStateWithPageURL:pageURL];
+ _webStateImpl->OnSamePageNavigation(pageURL);
self.userInteractionRegistered = NO;
}
-- (void)replaceStateWithPageURL:(const GURL&)pageUrl
+- (void)replaceStateWithPageURL:(const GURL&)pageURL
stateObject:(NSString*)stateObject {
- [[self sessionController] updateCurrentItemWithURL:pageUrl
+ [[self sessionController] updateCurrentItemWithURL:pageURL
stateObject:stateObject];
- [self didUpdateHistoryStateWithPageURL:pageUrl];
+ _webStateImpl->OnSamePageNavigation(pageURL);
}
- (void)setDocumentURL:(const GURL&)newURL {
@@ -4043,11 +4041,6 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
return [_delegate headerHeightForWebController:self];
}
-- (void)didUpdateHistoryStateWithPageURL:(const GURL&)url {
- _webStateImpl->OnSamePageNavigation(url);
- [_delegate webDidUpdateHistoryStateWithPageURL:url];
-}
-
- (void)updateSSLStatusForCurrentNavigationItem {
if (_isBeingDestroyed) {
return;
« no previous file with comments | « ios/web/public/web_state/web_state_observer_bridge.h ('k') | ios/web/web_state/web_state_observer_bridge.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698