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

Unified Diff: content/browser/ssl/ssl_manager.cc

Issue 2580753002: Fix NavigationControllerBrowserTest. EnsureSamePageNavigationUpdatesFrameNavigationEntry browser nav (Closed)
Patch Set: Revert changes to browser-side-navigation.linux.content_browsertests.filter. Will do that in a sepa… 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
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
}
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698