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

Unified Diff: ios/web/interstitials/web_interstitial_impl.mm

Issue 2759483002: Revert of Cleaned up old navigation code that did not use pending navigation item. (Closed)
Patch Set: 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/chrome/browser/web/visible_url_egtest.mm ('k') | ios/web/public/web_state/ui/crw_web_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/interstitials/web_interstitial_impl.mm
diff --git a/ios/web/interstitials/web_interstitial_impl.mm b/ios/web/interstitials/web_interstitial_impl.mm
index 1a9febb41a5510d446a02e7e28c507fae7d87804..30698e685af337157ee9d24329ae96206422b708 100644
--- a/ios/web/interstitials/web_interstitial_impl.mm
+++ b/ios/web/interstitials/web_interstitial_impl.mm
@@ -84,11 +84,18 @@
// Clear the pending entry, since that's the page that's not being
// proceeded to.
- GetWebStateImpl()->GetNavigationManager()->DiscardNonCommittedItems();
+ NavigationManager* nav_manager = GetWebStateImpl()->GetNavigationManager();
+ nav_manager->DiscardNonCommittedItems();
Hide();
GetDelegate()->OnDontProceed();
+
+ NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults];
+ if (![user_defaults boolForKey:@"PendingIndexNavigationDisabled"]) {
+ // Reload last committed entry.
+ nav_manager->Reload(ReloadType::NORMAL, true /* check_for_repost */);
+ }
delete this;
}
« no previous file with comments | « ios/chrome/browser/web/visible_url_egtest.mm ('k') | ios/web/public/web_state/ui/crw_web_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698