ios/web/interstitials/web_interstitial_impl.mm - Issue 2687343003: Fixed navigation for displayed SSL interstitials.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2687343003: Fixed navigation for displayed SSL interstitials. (Closed)

Patch Set: Preserve old behavior of pending navigation index is disabled. 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:

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 2e83b766c7ce18ac0eeec6e92a8d1c80b244ef39..4187248f05abc395d9c488a8ba14d1e31b82d500 100644

--- a/ios/web/interstitials/web_interstitial_impl.mm

+++ b/ios/web/interstitials/web_interstitial_impl.mm

@@ -90,8 +90,11 @@ void WebInterstitialImpl::DontProceed() {

GetDelegate()->OnDontProceed();

- // Reload last committed entry.

- nav_manager->Reload(true /* check_for_repost */);

+ NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults];

+ if (![user_defaults boolForKey:@"PendingIndexNavigationDisabled"]) {

+ // Reload last committed entry.

+ nav_manager->Reload(true /* check_for_repost */);

+ }

delete this;

}

« no previous file with comments | « ios/chrome/browser/tabs/tab.mm ('k') | ios/web/web_state/ui/crw_web_controller.mm » ('j') | no next file with comments »