| 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 | 278 |
| 279 #if defined(ENABLE_SPELLCHECK) | 279 #if defined(ENABLE_SPELLCHECK) |
| 280 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" | 280 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" |
| 281 #endif | 281 #endif |
| 282 | 282 |
| 283 #if defined(USE_BROWSER_SPELLCHECKER) | 283 #if defined(USE_BROWSER_SPELLCHECKER) |
| 284 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 284 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
| 285 #endif | 285 #endif |
| 286 | 286 |
| 287 #if defined(ENABLE_WEBRTC) | 287 #if defined(ENABLE_WEBRTC) |
| 288 #include "chrome/browser/media/audio_debug_recordings_handler.h" |
| 289 #include "chrome/browser/media/webrtc_event_log_handler.h" |
| 288 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 290 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 289 #endif | 291 #endif |
| 290 | 292 |
| 291 #if defined(ENABLE_MEDIA_ROUTER) | 293 #if defined(ENABLE_MEDIA_ROUTER) |
| 292 #include "chrome/browser/media/router/media_router_feature.h" | 294 #include "chrome/browser/media/router/media_router_feature.h" |
| 293 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 295 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 294 #endif | 296 #endif |
| 295 | 297 |
| 296 #if !defined(OS_ANDROID) | 298 #if !defined(OS_ANDROID) |
| 297 #include "device/usb/public/interfaces/chooser_service.mojom.h" | 299 #include "device/usb/public/interfaces/chooser_service.mojom.h" |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 949 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
| 948 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 950 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
| 949 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 951 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
| 950 #if defined(ENABLE_WEBRTC) | 952 #if defined(ENABLE_WEBRTC) |
| 951 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 953 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
| 952 new WebRtcLoggingHandlerHost( | 954 new WebRtcLoggingHandlerHost( |
| 953 profile, g_browser_process->webrtc_log_uploader()); | 955 profile, g_browser_process->webrtc_log_uploader()); |
| 954 host->SetWebRtcLogMessageCallback(base::Bind( | 956 host->SetWebRtcLogMessageCallback(base::Bind( |
| 955 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | 957 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
| 956 host->AddFilter(webrtc_logging_handler_host); | 958 host->AddFilter(webrtc_logging_handler_host); |
| 957 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 959 host->SetUserData(WebRtcLoggingHandlerHost::kWebRtcLoggingHandlerHostKey, |
| 958 webrtc_logging_handler_host)); | 960 new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| 961 webrtc_logging_handler_host)); |
| 962 |
| 963 AudioDebugRecordingsHandler* audio_debug_recordings_handler = |
| 964 new AudioDebugRecordingsHandler(profile); |
| 965 host->SetUserData( |
| 966 AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, |
| 967 new base::UserDataAdapter<AudioDebugRecordingsHandler>( |
| 968 audio_debug_recordings_handler)); |
| 969 |
| 970 WebRtcEventLogHandler* webrtc_event_log_handler = |
| 971 new WebRtcEventLogHandler(profile); |
| 972 host->SetUserData(WebRtcEventLogHandler::kWebRtcEventLogHandlerKey, |
| 973 new base::UserDataAdapter<WebRtcEventLogHandler>( |
| 974 webrtc_event_log_handler)); |
| 959 #endif | 975 #endif |
| 960 #if !defined(DISABLE_NACL) | 976 #if !defined(DISABLE_NACL) |
| 961 host->AddFilter(new nacl::NaClHostMessageFilter( | 977 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 962 id, profile->IsOffTheRecord(), | 978 id, profile->IsOffTheRecord(), |
| 963 profile->GetPath(), | 979 profile->GetPath(), |
| 964 context)); | 980 context)); |
| 965 #endif | 981 #endif |
| 966 #if defined(OS_ANDROID) | 982 #if defined(OS_ANDROID) |
| 967 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 983 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
| 968 #endif | 984 #endif |
| (...skipping 2010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2979 if (channel <= kMaxDisableEncryptionChannel) { | 2995 if (channel <= kMaxDisableEncryptionChannel) { |
| 2980 static const char* const kWebRtcDevSwitchNames[] = { | 2996 static const char* const kWebRtcDevSwitchNames[] = { |
| 2981 switches::kDisableWebRtcEncryption, | 2997 switches::kDisableWebRtcEncryption, |
| 2982 }; | 2998 }; |
| 2983 to_command_line->CopySwitchesFrom(from_command_line, | 2999 to_command_line->CopySwitchesFrom(from_command_line, |
| 2984 kWebRtcDevSwitchNames, | 3000 kWebRtcDevSwitchNames, |
| 2985 arraysize(kWebRtcDevSwitchNames)); | 3001 arraysize(kWebRtcDevSwitchNames)); |
| 2986 } | 3002 } |
| 2987 } | 3003 } |
| 2988 #endif // defined(ENABLE_WEBRTC) | 3004 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |