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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2363653002: Cleanup unreachable cert adding code (Closed)
Patch Set: Rebased Created 4 years, 2 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 unified diff | Download patch
OLDNEW
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 70 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
71 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 71 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
72 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 72 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
73 #include "chrome/browser/safe_browsing/ui_manager.h" 73 #include "chrome/browser/safe_browsing/ui_manager.h"
74 #include "chrome/browser/search/instant_service.h" 74 #include "chrome/browser/search/instant_service.h"
75 #include "chrome/browser/search/instant_service_factory.h" 75 #include "chrome/browser/search/instant_service_factory.h"
76 #include "chrome/browser/search/search.h" 76 #include "chrome/browser/search/search.h"
77 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 77 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
78 #include "chrome/browser/speech/tts_controller.h" 78 #include "chrome/browser/speech/tts_controller.h"
79 #include "chrome/browser/speech/tts_message_filter.h" 79 #include "chrome/browser/speech/tts_message_filter.h"
80 #include "chrome/browser/ssl/ssl_add_certificate.h"
81 #include "chrome/browser/ssl/ssl_blocking_page.h" 80 #include "chrome/browser/ssl/ssl_blocking_page.h"
82 #include "chrome/browser/ssl/ssl_cert_reporter.h" 81 #include "chrome/browser/ssl/ssl_cert_reporter.h"
83 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
84 #include "chrome/browser/ssl/ssl_error_handler.h" 83 #include "chrome/browser/ssl/ssl_error_handler.h"
85 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" 84 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
86 #include "chrome/browser/tab_contents/tab_util.h" 85 #include "chrome/browser/tab_contents/tab_util.h"
87 #include "chrome/browser/tracing/chrome_tracing_delegate.h" 86 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
88 #include "chrome/browser/translate/chrome_translate_client.h" 87 #include "chrome/browser/translate/chrome_translate_client.h"
89 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" 88 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
90 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" 89 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
(...skipping 2121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 } 2211 }
2213 } else { 2212 } else {
2214 NOTREACHED(); 2213 NOTREACHED();
2215 } 2214 }
2216 } 2215 }
2217 2216
2218 chrome::ShowSSLClientCertificateSelector(web_contents, cert_request_info, 2217 chrome::ShowSSLClientCertificateSelector(web_contents, cert_request_info,
2219 std::move(delegate)); 2218 std::move(delegate));
2220 } 2219 }
2221 2220
2222 void ChromeContentBrowserClient::AddCertificate(
2223 net::CertificateMimeType cert_type,
2224 const void* cert_data,
2225 size_t cert_size,
2226 int render_process_id,
2227 int render_frame_id) {
2228 chrome::SSLAddCertificate(cert_type, cert_data, cert_size,
2229 render_process_id, render_frame_id);
2230 }
2231
2232 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { 2221 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
2233 return MediaCaptureDevicesDispatcher::GetInstance(); 2222 return MediaCaptureDevicesDispatcher::GetInstance();
2234 } 2223 }
2235 2224
2236 content::PlatformNotificationService* 2225 content::PlatformNotificationService*
2237 ChromeContentBrowserClient::GetPlatformNotificationService() { 2226 ChromeContentBrowserClient::GetPlatformNotificationService() {
2238 #if defined(ENABLE_NOTIFICATIONS) 2227 #if defined(ENABLE_NOTIFICATIONS)
2239 return PlatformNotificationServiceImpl::GetInstance(); 2228 return PlatformNotificationServiceImpl::GetInstance();
2240 #else 2229 #else
2241 NOTIMPLEMENTED(); 2230 NOTIMPLEMENTED();
(...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after
3247 if (channel <= kMaxDisableEncryptionChannel) { 3236 if (channel <= kMaxDisableEncryptionChannel) {
3248 static const char* const kWebRtcDevSwitchNames[] = { 3237 static const char* const kWebRtcDevSwitchNames[] = {
3249 switches::kDisableWebRtcEncryption, 3238 switches::kDisableWebRtcEncryption,
3250 }; 3239 };
3251 to_command_line->CopySwitchesFrom(from_command_line, 3240 to_command_line->CopySwitchesFrom(from_command_line,
3252 kWebRtcDevSwitchNames, 3241 kWebRtcDevSwitchNames,
3253 arraysize(kWebRtcDevSwitchNames)); 3242 arraysize(kWebRtcDevSwitchNames));
3254 } 3243 }
3255 } 3244 }
3256 #endif // defined(ENABLE_WEBRTC) 3245 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/platform_keys/platform_keys_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698