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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 124113003: Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHost… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify Created 6 years, 11 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
Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc (revision 243099)
+++ chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -1783,7 +1783,7 @@
}
prerender::PrerenderContents* prerender_contents =
- prerender::PrerenderContents::FromWebContents(tab);
+ prerender::PrerenderContents::FromWebContents(tab);
if (prerender_contents) {
prerender_contents->Destroy(prerender::FINAL_STATUS_SSL_ERROR);
*result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
@@ -1810,14 +1810,17 @@
const base::Callback<void(net::X509Certificate*)>& callback) {
content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
render_process_id, render_frame_id);
- if (!rfh) {
+ WebContents* tab = WebContents::FromRenderFrameHost(rfh);
+ if (!tab) {
NOTREACHED();
return;
}
- WebContents* tab = WebContents::FromRenderFrameHost(rfh);
- if (!tab) {
- NOTREACHED();
+ prerender::PrerenderContents* prerender_contents =
+ prerender::PrerenderContents::FromWebContents(tab);
+ if (prerender_contents) {
+ prerender_contents->Destroy(
+ prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED);
return;
}

Powered by Google App Engine
This is Rietveld 408576698