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

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

Issue 2694623013: Fixed navigation for displayed SSL interstitials. (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
« no previous file with comments | « ios/web/interstitials/web_interstitial_impl.mm ('k') | no next file » | 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 f77fc8663c5fdc4042dede4d58991c6d38c25f33..79ca3a8af824401d65a575173e5f1086552a726b 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -2209,9 +2209,11 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
if (![userDefaults boolForKey:@"PendingIndexNavigationDisabled"]) {
- BOOL sameDocumentNavigation =
- [sessionController isSameDocumentNavigationBetweenEntry:fromEntry
- andEntry:entries[index]];
+ [self clearTransientContentView];
+
+ BOOL sameDocumentNavigation = [sessionController
+ isSameDocumentNavigationBetweenItem:fromEntry.navigationItem
+ andItem:toEntry.navigationItem];
if (sameDocumentNavigation) {
[self.sessionController goToEntryAtIndex:index];
« no previous file with comments | « ios/web/interstitials/web_interstitial_impl.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698