content/browser/ssl/ssl_manager.cc - Issue 2580753002: Fix NavigationControllerBrowserTest. EnsureSamePageNavigationUpdatesFrameNavigationEntry browser nav

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: content/browser/ssl/ssl_manager.cc

Issue 2580753002: Fix NavigationControllerBrowserTest. EnsureSamePageNavigationUpdatesFrameNavigationEntry browser nav (Closed)

Patch Set: Move the code which determines which transitions to treat as forced reloads to its own function Sho… 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:

Index: content/browser/ssl/ssl_manager.cc

diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc

index c9cf39e41a3ef946a2da5e68694fa775539cb9e6..df2e7575b49da85f0455e6e880cc5e0f01d02318 100644

--- a/content/browser/ssl/ssl_manager.cc

+++ b/content/browser/ssl/ssl_manager.cc

@@ -105,9 +105,11 @@ void HandleSSLErrorOnUI(

return;

}

- SSLManager* manager =

- static_cast<NavigationControllerImpl*>(&web_contents->GetController())

- ->ssl_manager();

+ NavigationControllerImpl* controller =

+ static_cast<NavigationControllerImpl*>(&web_contents->GetController());

+ controller->SetPendingNavigationSSLError(true);

+ SSLManager* manager = controller->ssl_manager();

manager->OnCertError(std::move(handler));

}