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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2144 } | 2144 } |
2145 } else { | 2145 } else { |
2146 NOTREACHED(); | 2146 NOTREACHED(); |
2147 } | 2147 } |
2148 } | 2148 } |
2149 | 2149 |
2150 chrome::ShowSSLClientCertificateSelector(web_contents, cert_request_info, | 2150 chrome::ShowSSLClientCertificateSelector(web_contents, cert_request_info, |
2151 std::move(delegate)); | 2151 std::move(delegate)); |
2152 } | 2152 } |
2153 | 2153 |
2154 void ChromeContentBrowserClient::AddCertificate( | |
2155 net::CertificateMimeType cert_type, | |
2156 const void* cert_data, | |
2157 size_t cert_size, | |
2158 int render_process_id, | |
2159 int render_frame_id) { | |
2160 chrome::SSLAddCertificate(cert_type, cert_data, cert_size, | |
2161 render_process_id, render_frame_id); | |
2162 } | |
2163 | |
2164 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { | 2154 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { |
2165 return MediaCaptureDevicesDispatcher::GetInstance(); | 2155 return MediaCaptureDevicesDispatcher::GetInstance(); |
2166 } | 2156 } |
2167 | 2157 |
2168 content::PlatformNotificationService* | 2158 content::PlatformNotificationService* |
2169 ChromeContentBrowserClient::GetPlatformNotificationService() { | 2159 ChromeContentBrowserClient::GetPlatformNotificationService() { |
2170 #if defined(ENABLE_NOTIFICATIONS) | 2160 #if defined(ENABLE_NOTIFICATIONS) |
2171 return PlatformNotificationServiceImpl::GetInstance(); | 2161 return PlatformNotificationServiceImpl::GetInstance(); |
2172 #else | 2162 #else |
2173 NOTIMPLEMENTED(); | 2163 NOTIMPLEMENTED(); |
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3199 if (channel <= kMaxDisableEncryptionChannel) { | 3189 if (channel <= kMaxDisableEncryptionChannel) { |
3200 static const char* const kWebRtcDevSwitchNames[] = { | 3190 static const char* const kWebRtcDevSwitchNames[] = { |
3201 switches::kDisableWebRtcEncryption, | 3191 switches::kDisableWebRtcEncryption, |
3202 }; | 3192 }; |
3203 to_command_line->CopySwitchesFrom(from_command_line, | 3193 to_command_line->CopySwitchesFrom(from_command_line, |
3204 kWebRtcDevSwitchNames, | 3194 kWebRtcDevSwitchNames, |
3205 arraysize(kWebRtcDevSwitchNames)); | 3195 arraysize(kWebRtcDevSwitchNames)); |
3206 } | 3196 } |
3207 } | 3197 } |
3208 #endif // defined(ENABLE_WEBRTC) | 3198 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |