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

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

Issue 2578173005: Add GetOriginalRequestURL() to NavigationItem interface. (Closed)
Patch Set: Created 4 years 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 7dfacea8bdd1b0dd9f76b3c5a92887a1bb5aa31c..0718a82927b9365604e029c412a7f5dfb0a62c2c 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -2193,13 +2193,11 @@ - (void)triggerPendingLoad {
- (BOOL)shouldReload:(const GURL&)destinationURL
transition:(ui::PageTransition)transition {
// Do a reload if the user hits enter in the address bar or re-types a URL.
- CRWSessionController* sessionController =
- _webStateImpl->GetNavigationManagerImpl().GetSessionController();
web::NavigationItem* item =
_webStateImpl->GetNavigationManagerImpl().GetVisibleItem();
return (transition & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) && item &&
(destinationURL == item->GetURL() ||
- destinationURL == [sessionController currentEntry].originalUrl);
+ destinationURL == item->GetOriginalRequestURL());
}
// Reload either the web view or the native content depending on which is
« ios/web/navigation/crw_session_entry.mm ('K') | « ios/web/public/navigation_item.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698