| 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 2001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2012 } | 2012 } |
| 2013 | 2013 |
| 2014 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 2014 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 2015 CaptivePortalTabHelper* captive_portal_tab_helper = | 2015 CaptivePortalTabHelper* captive_portal_tab_helper = |
| 2016 CaptivePortalTabHelper::FromWebContents(tab); | 2016 CaptivePortalTabHelper::FromWebContents(tab); |
| 2017 if (captive_portal_tab_helper) | 2017 if (captive_portal_tab_helper) |
| 2018 captive_portal_tab_helper->OnSSLCertError(ssl_info); | 2018 captive_portal_tab_helper->OnSSLCertError(ssl_info); |
| 2019 #endif | 2019 #endif |
| 2020 | 2020 |
| 2021 // Otherwise, display an SSL blocking page. | 2021 // Otherwise, display an SSL blocking page. |
| 2022 SSLBlockingPage::Show(tab, cert_error, ssl_info, request_url, overridable, | 2022 new SSLBlockingPage(tab, cert_error, ssl_info, request_url, overridable, |
| 2023 strict_enforcement, callback); | 2023 strict_enforcement, callback); |
| 2024 } | 2024 } |
| 2025 | 2025 |
| 2026 void ChromeContentBrowserClient::SelectClientCertificate( | 2026 void ChromeContentBrowserClient::SelectClientCertificate( |
| 2027 int render_process_id, | 2027 int render_process_id, |
| 2028 int render_frame_id, | 2028 int render_frame_id, |
| 2029 const net::HttpNetworkSession* network_session, | 2029 const net::HttpNetworkSession* network_session, |
| 2030 net::SSLCertRequestInfo* cert_request_info, | 2030 net::SSLCertRequestInfo* cert_request_info, |
| 2031 const base::Callback<void(net::X509Certificate*)>& callback) { | 2031 const base::Callback<void(net::X509Certificate*)>& callback) { |
| 2032 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( | 2032 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( |
| 2033 render_process_id, render_frame_id); | 2033 render_process_id, render_frame_id); |
| (...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2954 } | 2954 } |
| 2955 #endif // defined(ENABLE_WEBRTC) | 2955 #endif // defined(ENABLE_WEBRTC) |
| 2956 | 2956 |
| 2957 | 2957 |
| 2958 void ChromeContentBrowserClient::NotificationPermissionRequested( | 2958 void ChromeContentBrowserClient::NotificationPermissionRequested( |
| 2959 const base::Closure& callback, bool result) { | 2959 const base::Closure& callback, bool result) { |
| 2960 callback.Run(); | 2960 callback.Run(); |
| 2961 } | 2961 } |
| 2962 | 2962 |
| 2963 } // namespace chrome | 2963 } // namespace chrome |
| OLD | NEW |