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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
912 host->AddFilter(new SpellCheckMessageFilterMac(id)); | 912 host->AddFilter(new SpellCheckMessageFilterMac(id)); |
913 #endif | 913 #endif |
914 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 914 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
915 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 915 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
916 host->AddFilter(new TtsMessageFilter(id, profile)); | 916 host->AddFilter(new TtsMessageFilter(id, profile)); |
917 #if defined(ENABLE_WEBRTC) | 917 #if defined(ENABLE_WEBRTC) |
918 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 918 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
919 new WebRtcLoggingHandlerHost(profile); | 919 new WebRtcLoggingHandlerHost(profile); |
920 host->SetWebRtcLogMessageCallback(base::Bind( | 920 host->SetWebRtcLogMessageCallback(base::Bind( |
921 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | 921 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
| 922 host->SetWebRtcRtpPacketCallback(base::Bind( |
| 923 &WebRtcLoggingHandlerHost::OnRtpPacket, webrtc_logging_handler_host)); |
922 host->AddFilter(webrtc_logging_handler_host); | 924 host->AddFilter(webrtc_logging_handler_host); |
923 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 925 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
924 webrtc_logging_handler_host)); | 926 webrtc_logging_handler_host)); |
925 #endif | 927 #endif |
926 #if !defined(DISABLE_NACL) | 928 #if !defined(DISABLE_NACL) |
927 host->AddFilter(new nacl::NaClHostMessageFilter( | 929 host->AddFilter(new nacl::NaClHostMessageFilter( |
928 id, profile->IsOffTheRecord(), | 930 id, profile->IsOffTheRecord(), |
929 profile->GetPath(), | 931 profile->GetPath(), |
930 context)); | 932 context)); |
931 #endif | 933 #endif |
(...skipping 1768 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2700 switches::kDisableWebRtcEncryption, | 2702 switches::kDisableWebRtcEncryption, |
2701 }; | 2703 }; |
2702 to_command_line->CopySwitchesFrom(from_command_line, | 2704 to_command_line->CopySwitchesFrom(from_command_line, |
2703 kWebRtcDevSwitchNames, | 2705 kWebRtcDevSwitchNames, |
2704 arraysize(kWebRtcDevSwitchNames)); | 2706 arraysize(kWebRtcDevSwitchNames)); |
2705 } | 2707 } |
2706 } | 2708 } |
2707 #endif // defined(ENABLE_WEBRTC) | 2709 #endif // defined(ENABLE_WEBRTC) |
2708 | 2710 |
2709 } // namespace chrome | 2711 } // namespace chrome |
OLD | NEW |