OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1768 | 1768 |
1769 void ChromeContentBrowserClient::SelectClientCertificate( | 1769 void ChromeContentBrowserClient::SelectClientCertificate( |
1770 int render_process_id, | 1770 int render_process_id, |
1771 int render_frame_id, | 1771 int render_frame_id, |
1772 net::SSLCertRequestInfo* cert_request_info, | 1772 net::SSLCertRequestInfo* cert_request_info, |
1773 const base::Callback<void(net::X509Certificate*)>& callback) { | 1773 const base::Callback<void(net::X509Certificate*)>& callback) { |
1774 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( | 1774 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( |
1775 render_process_id, render_frame_id); | 1775 render_process_id, render_frame_id); |
1776 WebContents* tab = WebContents::FromRenderFrameHost(rfh); | 1776 WebContents* tab = WebContents::FromRenderFrameHost(rfh); |
1777 if (!tab) { | 1777 if (!tab) { |
1778 NOTREACHED(); | 1778 // TODO(davidben): This makes the request hang, but returning no certificate |
| 1779 // also breaks. It should abort the request. See https://crbug.com/417092 |
1779 return; | 1780 return; |
1780 } | 1781 } |
1781 | 1782 |
1782 prerender::PrerenderContents* prerender_contents = | 1783 prerender::PrerenderContents* prerender_contents = |
1783 prerender::PrerenderContents::FromWebContents(tab); | 1784 prerender::PrerenderContents::FromWebContents(tab); |
1784 if (prerender_contents) { | 1785 if (prerender_contents) { |
1785 prerender_contents->Destroy( | 1786 prerender_contents->Destroy( |
1786 prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED); | 1787 prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED); |
1787 return; | 1788 return; |
1788 } | 1789 } |
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2551 switches::kDisableWebRtcEncryption, | 2552 switches::kDisableWebRtcEncryption, |
2552 }; | 2553 }; |
2553 to_command_line->CopySwitchesFrom(from_command_line, | 2554 to_command_line->CopySwitchesFrom(from_command_line, |
2554 kWebRtcDevSwitchNames, | 2555 kWebRtcDevSwitchNames, |
2555 arraysize(kWebRtcDevSwitchNames)); | 2556 arraysize(kWebRtcDevSwitchNames)); |
2556 } | 2557 } |
2557 } | 2558 } |
2558 #endif // defined(ENABLE_WEBRTC) | 2559 #endif // defined(ENABLE_WEBRTC) |
2559 | 2560 |
2560 } // namespace chrome | 2561 } // namespace chrome |
OLD | NEW |