| 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 | 276 |
| 277 #if defined(ENABLE_SPELLCHECK) | 277 #if defined(ENABLE_SPELLCHECK) |
| 278 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" | 278 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" |
| 279 #endif | 279 #endif |
| 280 | 280 |
| 281 #if defined(USE_BROWSER_SPELLCHECKER) | 281 #if defined(USE_BROWSER_SPELLCHECKER) |
| 282 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 282 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
| 283 #endif | 283 #endif |
| 284 | 284 |
| 285 #if defined(ENABLE_WEBRTC) | 285 #if defined(ENABLE_WEBRTC) |
| 286 #include "chrome/browser/media/audio_debug_recordings_handler.h" |
| 287 #include "chrome/browser/media/rtc_event_log_handler.h" |
| 286 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 288 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 287 #endif | 289 #endif |
| 288 | 290 |
| 289 #if defined(ENABLE_MEDIA_ROUTER) | 291 #if defined(ENABLE_MEDIA_ROUTER) |
| 290 #include "chrome/browser/media/router/media_router_feature.h" | 292 #include "chrome/browser/media/router/media_router_feature.h" |
| 291 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 293 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 292 #endif | 294 #endif |
| 293 | 295 |
| 294 #if !defined(OS_ANDROID) | 296 #if !defined(OS_ANDROID) |
| 295 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" | 297 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 937 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
| 936 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 938 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
| 937 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 939 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
| 938 #if defined(ENABLE_WEBRTC) | 940 #if defined(ENABLE_WEBRTC) |
| 939 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 941 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
| 940 new WebRtcLoggingHandlerHost( | 942 new WebRtcLoggingHandlerHost( |
| 941 profile, g_browser_process->webrtc_log_uploader()); | 943 profile, g_browser_process->webrtc_log_uploader()); |
| 942 host->SetWebRtcLogMessageCallback(base::Bind( | 944 host->SetWebRtcLogMessageCallback(base::Bind( |
| 943 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | 945 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
| 944 host->AddFilter(webrtc_logging_handler_host); | 946 host->AddFilter(webrtc_logging_handler_host); |
| 945 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 947 host->SetUserData(WebRtcLoggingHandlerHost::kWebRtcLoggingHandlerHostKey, |
| 946 webrtc_logging_handler_host)); | 948 new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| 949 webrtc_logging_handler_host)); |
| 950 |
| 951 AudioDebugRecordingsHandler* audio_debug_recordings_handler = |
| 952 new AudioDebugRecordingsHandler(profile); |
| 953 host->SetUserData( |
| 954 AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, |
| 955 new base::UserDataAdapter<AudioDebugRecordingsHandler>( |
| 956 audio_debug_recordings_handler)); |
| 957 |
| 958 WebRtcEventLogHandler* webrtc_event_log_handler = |
| 959 new WebRtcEventLogHandler(profile); |
| 960 host->SetUserData(WebRtcEventLogHandler::kWebRtcEventLogHandlerKey, |
| 961 new base::UserDataAdapter<WebRtcEventLogHandler>( |
| 962 webrtc_event_log_handler)); |
| 947 #endif | 963 #endif |
| 948 #if !defined(DISABLE_NACL) | 964 #if !defined(DISABLE_NACL) |
| 949 host->AddFilter(new nacl::NaClHostMessageFilter( | 965 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 950 id, profile->IsOffTheRecord(), | 966 id, profile->IsOffTheRecord(), |
| 951 profile->GetPath(), | 967 profile->GetPath(), |
| 952 context)); | 968 context)); |
| 953 #endif | 969 #endif |
| 954 #if defined(OS_ANDROID) | 970 #if defined(OS_ANDROID) |
| 955 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 971 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
| 956 #endif | 972 #endif |
| (...skipping 1985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2942 if (channel <= kMaxDisableEncryptionChannel) { | 2958 if (channel <= kMaxDisableEncryptionChannel) { |
| 2943 static const char* const kWebRtcDevSwitchNames[] = { | 2959 static const char* const kWebRtcDevSwitchNames[] = { |
| 2944 switches::kDisableWebRtcEncryption, | 2960 switches::kDisableWebRtcEncryption, |
| 2945 }; | 2961 }; |
| 2946 to_command_line->CopySwitchesFrom(from_command_line, | 2962 to_command_line->CopySwitchesFrom(from_command_line, |
| 2947 kWebRtcDevSwitchNames, | 2963 kWebRtcDevSwitchNames, |
| 2948 arraysize(kWebRtcDevSwitchNames)); | 2964 arraysize(kWebRtcDevSwitchNames)); |
| 2949 } | 2965 } |
| 2950 } | 2966 } |
| 2951 #endif // defined(ENABLE_WEBRTC) | 2967 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |