| 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 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 934 host->AddFilter(new SpellCheckMessageFilter(id)); | 934 host->AddFilter(new SpellCheckMessageFilter(id)); |
| 935 #endif | 935 #endif |
| 936 #if defined(USE_BROWSER_SPELLCHECKER) | 936 #if defined(USE_BROWSER_SPELLCHECKER) |
| 937 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); | 937 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); |
| 938 #endif | 938 #endif |
| 939 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 939 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
| 940 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 940 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
| 941 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 941 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
| 942 #if defined(ENABLE_WEBRTC) | 942 #if defined(ENABLE_WEBRTC) |
| 943 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = | 943 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = |
| 944 new WebRtcLoggingHandlerHost( | 944 new WebRtcLoggingHandlerHost(id, profile, |
| 945 profile, g_browser_process->webrtc_log_uploader()); | 945 g_browser_process->webrtc_log_uploader()); |
| 946 host->SetWebRtcLogMessageCallback(base::Bind( | |
| 947 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); | |
| 948 host->AddFilter(webrtc_logging_handler_host); | 946 host->AddFilter(webrtc_logging_handler_host); |
| 949 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( | 947 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| 950 webrtc_logging_handler_host)); | 948 webrtc_logging_handler_host)); |
| 951 #endif | 949 #endif |
| 952 #if !defined(DISABLE_NACL) | 950 #if !defined(DISABLE_NACL) |
| 953 host->AddFilter(new nacl::NaClHostMessageFilter( | 951 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 954 id, profile->IsOffTheRecord(), | 952 id, profile->IsOffTheRecord(), |
| 955 profile->GetPath(), | 953 profile->GetPath(), |
| 956 context)); | 954 context)); |
| 957 #endif | 955 #endif |
| (...skipping 2011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2969 if (channel <= kMaxDisableEncryptionChannel) { | 2967 if (channel <= kMaxDisableEncryptionChannel) { |
| 2970 static const char* const kWebRtcDevSwitchNames[] = { | 2968 static const char* const kWebRtcDevSwitchNames[] = { |
| 2971 switches::kDisableWebRtcEncryption, | 2969 switches::kDisableWebRtcEncryption, |
| 2972 }; | 2970 }; |
| 2973 to_command_line->CopySwitchesFrom(from_command_line, | 2971 to_command_line->CopySwitchesFrom(from_command_line, |
| 2974 kWebRtcDevSwitchNames, | 2972 kWebRtcDevSwitchNames, |
| 2975 arraysize(kWebRtcDevSwitchNames)); | 2973 arraysize(kWebRtcDevSwitchNames)); |
| 2976 } | 2974 } |
| 2977 } | 2975 } |
| 2978 #endif // defined(ENABLE_WEBRTC) | 2976 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |