| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 283 |
| 284 #if defined(ENABLE_SPELLCHECK) | 284 #if defined(ENABLE_SPELLCHECK) |
| 285 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" | 285 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" |
| 286 #endif | 286 #endif |
| 287 | 287 |
| 288 #if defined(USE_BROWSER_SPELLCHECKER) | 288 #if defined(USE_BROWSER_SPELLCHECKER) |
| 289 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 289 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
| 290 #endif | 290 #endif |
| 291 | 291 |
| 292 #if defined(ENABLE_WEBRTC) | 292 #if defined(ENABLE_WEBRTC) |
| 293 #include "chrome/browser/media/audio_debug_recordings_handler.h" |
| 294 #include "chrome/browser/media/webrtc_event_log_handler.h" |
| 293 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 295 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 294 #endif | 296 #endif |
| 295 | 297 |
| 296 #if defined(ENABLE_MEDIA_ROUTER) | 298 #if defined(ENABLE_MEDIA_ROUTER) |
| 297 #include "chrome/browser/media/router/media_router_feature.h" | 299 #include "chrome/browser/media/router/media_router_feature.h" |
| 298 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 300 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 299 #endif | 301 #endif |
| 300 | 302 |
| 301 #if defined(ENABLE_WAYLAND_SERVER) | 303 #if defined(ENABLE_WAYLAND_SERVER) |
| 302 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 304 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 941 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); | 943 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); |
| 942 #endif | 944 #endif |
| 943 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 945 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
| 944 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 946 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
| 945 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 947 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
| 946 #if defined(ENABLE_WEBRTC) | 948 #if defined(ENABLE_WEBRTC) |
| 947 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 949 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
| 948 new WebRtcLoggingHandlerHost(id, profile, | 950 new WebRtcLoggingHandlerHost(id, profile, |
| 949 g_browser_process->webrtc_log_uploader()); | 951 g_browser_process->webrtc_log_uploader()); |
| 950 host->AddFilter(webrtc_logging_handler_host); | 952 host->AddFilter(webrtc_logging_handler_host); |
| 951 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 953 host->SetUserData(WebRtcLoggingHandlerHost::kWebRtcLoggingHandlerHostKey, |
| 952 webrtc_logging_handler_host)); | 954 new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| 955 webrtc_logging_handler_host)); |
| 956 |
| 957 AudioDebugRecordingsHandler* audio_debug_recordings_handler = |
| 958 new AudioDebugRecordingsHandler(profile); |
| 959 host->SetUserData( |
| 960 AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, |
| 961 new base::UserDataAdapter<AudioDebugRecordingsHandler>( |
| 962 audio_debug_recordings_handler)); |
| 963 |
| 964 WebRtcEventLogHandler* webrtc_event_log_handler = |
| 965 new WebRtcEventLogHandler(profile); |
| 966 host->SetUserData(WebRtcEventLogHandler::kWebRtcEventLogHandlerKey, |
| 967 new base::UserDataAdapter<WebRtcEventLogHandler>( |
| 968 webrtc_event_log_handler)); |
| 953 #endif | 969 #endif |
| 954 #if !defined(DISABLE_NACL) | 970 #if !defined(DISABLE_NACL) |
| 955 host->AddFilter(new nacl::NaClHostMessageFilter( | 971 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 956 id, profile->IsOffTheRecord(), | 972 id, profile->IsOffTheRecord(), |
| 957 profile->GetPath(), | 973 profile->GetPath(), |
| 958 context)); | 974 context)); |
| 959 #endif | 975 #endif |
| 960 #if defined(OS_ANDROID) | 976 #if defined(OS_ANDROID) |
| 961 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 977 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
| 962 #endif | 978 #endif |
| (...skipping 1981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2944 if (channel <= kMaxDisableEncryptionChannel) { | 2960 if (channel <= kMaxDisableEncryptionChannel) { |
| 2945 static const char* const kWebRtcDevSwitchNames[] = { | 2961 static const char* const kWebRtcDevSwitchNames[] = { |
| 2946 switches::kDisableWebRtcEncryption, | 2962 switches::kDisableWebRtcEncryption, |
| 2947 }; | 2963 }; |
| 2948 to_command_line->CopySwitchesFrom(from_command_line, | 2964 to_command_line->CopySwitchesFrom(from_command_line, |
| 2949 kWebRtcDevSwitchNames, | 2965 kWebRtcDevSwitchNames, |
| 2950 arraysize(kWebRtcDevSwitchNames)); | 2966 arraysize(kWebRtcDevSwitchNames)); |
| 2951 } | 2967 } |
| 2952 } | 2968 } |
| 2953 #endif // defined(ENABLE_WEBRTC) | 2969 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |