Chromium Code Reviews| 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/audio_debug_recordings_handler.h" | |
| 283 #include "chrome/browser/media/rtc_event_log_handler.h" | |
| 282 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 284 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 283 #endif | 285 #endif |
| 284 | 286 |
| 285 #if defined(ENABLE_MEDIA_ROUTER) | 287 #if defined(ENABLE_MEDIA_ROUTER) |
| 286 #include "chrome/browser/media/router/media_router_feature.h" | 288 #include "chrome/browser/media/router/media_router_feature.h" |
| 287 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 289 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 288 #endif | 290 #endif |
| 289 | 291 |
| 290 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 292 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 291 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" | 293 #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)); | 918 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
| 917 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 919 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
| 918 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 920 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
| 919 #if defined(ENABLE_WEBRTC) | 921 #if defined(ENABLE_WEBRTC) |
| 920 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 922 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
| 921 new WebRtcLoggingHandlerHost( | 923 new WebRtcLoggingHandlerHost( |
| 922 profile, g_browser_process->webrtc_log_uploader()); | 924 profile, g_browser_process->webrtc_log_uploader()); |
| 923 host->SetWebRtcLogMessageCallback(base::Bind( | 925 host->SetWebRtcLogMessageCallback(base::Bind( |
| 924 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | 926 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
| 925 host->AddFilter(webrtc_logging_handler_host); | 927 host->AddFilter(webrtc_logging_handler_host); |
| 926 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 928 host->SetUserData(WebRtcLoggingHandlerHost::kWebRtcLoggingHandlerHostKey, |
| 927 webrtc_logging_handler_host)); | 929 new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| 930 webrtc_logging_handler_host)); | |
| 931 | |
| 932 AudioDebugRecordingsHandler* audio_debug_recordings_handler = | |
| 933 new AudioDebugRecordingsHandler(profile); | |
| 934 host->SetUserData( | |
| 935 AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, | |
|
Henrik Grunell
2016/02/23 15:29:10
Looks like different indentation than above. Run '
terelius-chromium
2016/03/02 10:01:09
Done, but I don't think 'git cl format' does what
Henrik Grunell
2016/03/10 21:33:34
I think it usually works well. If it messes up the
| |
| 936 new base::UserDataAdapter<AudioDebugRecordingsHandler>( | |
| 937 audio_debug_recordings_handler)); | |
| 938 | |
| 939 RtcEventLogHandler* rtc_event_log_handler = new RtcEventLogHandler(profile); | |
| 940 host->SetUserData( | |
| 941 RtcEventLogHandler::kRtcEventLogHandlerKey, | |
| 942 new base::UserDataAdapter<RtcEventLogHandler>(rtc_event_log_handler)); | |
| 928 #endif | 943 #endif |
| 929 #if !defined(DISABLE_NACL) | 944 #if !defined(DISABLE_NACL) |
| 930 host->AddFilter(new nacl::NaClHostMessageFilter( | 945 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 931 id, profile->IsOffTheRecord(), | 946 id, profile->IsOffTheRecord(), |
| 932 profile->GetPath(), | 947 profile->GetPath(), |
| 933 context)); | 948 context)); |
| 934 #endif | 949 #endif |
| 935 #if defined(OS_ANDROID) | 950 #if defined(OS_ANDROID) |
| 936 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 951 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
| 937 #endif | 952 #endif |
| (...skipping 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2889 if (channel <= kMaxDisableEncryptionChannel) { | 2904 if (channel <= kMaxDisableEncryptionChannel) { |
| 2890 static const char* const kWebRtcDevSwitchNames[] = { | 2905 static const char* const kWebRtcDevSwitchNames[] = { |
| 2891 switches::kDisableWebRtcEncryption, | 2906 switches::kDisableWebRtcEncryption, |
| 2892 }; | 2907 }; |
| 2893 to_command_line->CopySwitchesFrom(from_command_line, | 2908 to_command_line->CopySwitchesFrom(from_command_line, |
| 2894 kWebRtcDevSwitchNames, | 2909 kWebRtcDevSwitchNames, |
| 2895 arraysize(kWebRtcDevSwitchNames)); | 2910 arraysize(kWebRtcDevSwitchNames)); |
| 2896 } | 2911 } |
| 2897 } | 2912 } |
| 2898 #endif // defined(ENABLE_WEBRTC) | 2913 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |