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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
272 | 272 |
273 #if defined(ENABLE_SPELLCHECK) | 273 #if defined(ENABLE_SPELLCHECK) |
274 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" | 274 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" |
275 #endif | 275 #endif |
276 | 276 |
277 #if defined(USE_BROWSER_SPELLCHECKER) | 277 #if defined(USE_BROWSER_SPELLCHECKER) |
278 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 278 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
279 #endif | 279 #endif |
280 | 280 |
281 #if defined(ENABLE_WEBRTC) | 281 #if defined(ENABLE_WEBRTC) |
| 282 #include "chrome/browser/media/webrtc_internal_log_handler_host.h" |
282 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 283 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
283 #endif | 284 #endif |
284 | 285 |
285 #if defined(ENABLE_MEDIA_ROUTER) | 286 #if defined(ENABLE_MEDIA_ROUTER) |
286 #include "chrome/browser/media/router/media_router_feature.h" | 287 #include "chrome/browser/media/router/media_router_feature.h" |
287 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 288 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
288 #endif | 289 #endif |
289 | 290 |
290 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 291 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
291 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" | 292 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" |
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
916 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 917 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
917 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 918 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
918 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 919 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
919 #if defined(ENABLE_WEBRTC) | 920 #if defined(ENABLE_WEBRTC) |
920 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 921 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
921 new WebRtcLoggingHandlerHost( | 922 new WebRtcLoggingHandlerHost( |
922 profile, g_browser_process->webrtc_log_uploader()); | 923 profile, g_browser_process->webrtc_log_uploader()); |
923 host->SetWebRtcLogMessageCallback(base::Bind( | 924 host->SetWebRtcLogMessageCallback(base::Bind( |
924 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | 925 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
925 host->AddFilter(webrtc_logging_handler_host); | 926 host->AddFilter(webrtc_logging_handler_host); |
926 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 927 host->SetUserData(WebRtcLoggingHandlerHost::kWebRtcLoggingHandlerHostKey, |
927 webrtc_logging_handler_host)); | 928 new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| 929 webrtc_logging_handler_host)); |
| 930 |
| 931 WebRtcInternalLogHandlerHost* webrtc_internal_log_handler_host = |
| 932 new WebRtcInternalLogHandlerHost(profile); |
| 933 host->SetUserData( |
| 934 WebRtcInternalLogHandlerHost::kWebRtcInternalLogHandlerHostKey, |
| 935 new base::UserDataAdapter<WebRtcInternalLogHandlerHost>( |
| 936 webrtc_internal_log_handler_host)); |
928 #endif | 937 #endif |
929 #if !defined(DISABLE_NACL) | 938 #if !defined(DISABLE_NACL) |
930 host->AddFilter(new nacl::NaClHostMessageFilter( | 939 host->AddFilter(new nacl::NaClHostMessageFilter( |
931 id, profile->IsOffTheRecord(), | 940 id, profile->IsOffTheRecord(), |
932 profile->GetPath(), | 941 profile->GetPath(), |
933 context)); | 942 context)); |
934 #endif | 943 #endif |
935 #if defined(OS_ANDROID) | 944 #if defined(OS_ANDROID) |
936 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 945 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
937 #endif | 946 #endif |
(...skipping 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2889 if (channel <= kMaxDisableEncryptionChannel) { | 2898 if (channel <= kMaxDisableEncryptionChannel) { |
2890 static const char* const kWebRtcDevSwitchNames[] = { | 2899 static const char* const kWebRtcDevSwitchNames[] = { |
2891 switches::kDisableWebRtcEncryption, | 2900 switches::kDisableWebRtcEncryption, |
2892 }; | 2901 }; |
2893 to_command_line->CopySwitchesFrom(from_command_line, | 2902 to_command_line->CopySwitchesFrom(from_command_line, |
2894 kWebRtcDevSwitchNames, | 2903 kWebRtcDevSwitchNames, |
2895 arraysize(kWebRtcDevSwitchNames)); | 2904 arraysize(kWebRtcDevSwitchNames)); |
2896 } | 2905 } |
2897 } | 2906 } |
2898 #endif // defined(ENABLE_WEBRTC) | 2907 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |