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 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
962 webrtc_logging_handler_host)); | 962 webrtc_logging_handler_host)); |
963 | 963 |
964 AudioDebugRecordingsHandler* audio_debug_recordings_handler = | 964 AudioDebugRecordingsHandler* audio_debug_recordings_handler = |
965 new AudioDebugRecordingsHandler(profile); | 965 new AudioDebugRecordingsHandler(profile); |
966 host->SetUserData( | 966 host->SetUserData( |
967 AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, | 967 AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, |
968 new base::UserDataAdapter<AudioDebugRecordingsHandler>( | 968 new base::UserDataAdapter<AudioDebugRecordingsHandler>( |
969 audio_debug_recordings_handler)); | 969 audio_debug_recordings_handler)); |
970 | 970 |
971 WebRtcEventLogHandler* webrtc_event_log_handler = | 971 WebRtcEventLogHandler* webrtc_event_log_handler = |
972 new WebRtcEventLogHandler(profile); | 972 new WebRtcEventLogHandler(id, profile); |
973 host->SetUserData(WebRtcEventLogHandler::kWebRtcEventLogHandlerKey, | 973 host->SetUserData(WebRtcEventLogHandler::kWebRtcEventLogHandlerKey, |
974 new base::UserDataAdapter<WebRtcEventLogHandler>( | 974 new base::UserDataAdapter<WebRtcEventLogHandler>( |
975 webrtc_event_log_handler)); | 975 webrtc_event_log_handler)); |
976 #endif | 976 #endif |
977 #if !defined(DISABLE_NACL) | 977 #if !defined(DISABLE_NACL) |
978 host->AddFilter(new nacl::NaClHostMessageFilter( | 978 host->AddFilter(new nacl::NaClHostMessageFilter( |
979 id, profile->IsOffTheRecord(), | 979 id, profile->IsOffTheRecord(), |
980 profile->GetPath(), | 980 profile->GetPath(), |
981 context)); | 981 context)); |
982 #endif | 982 #endif |
(...skipping 1981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2964 if (channel <= kMaxDisableEncryptionChannel) { | 2964 if (channel <= kMaxDisableEncryptionChannel) { |
2965 static const char* const kWebRtcDevSwitchNames[] = { | 2965 static const char* const kWebRtcDevSwitchNames[] = { |
2966 switches::kDisableWebRtcEncryption, | 2966 switches::kDisableWebRtcEncryption, |
2967 }; | 2967 }; |
2968 to_command_line->CopySwitchesFrom(from_command_line, | 2968 to_command_line->CopySwitchesFrom(from_command_line, |
2969 kWebRtcDevSwitchNames, | 2969 kWebRtcDevSwitchNames, |
2970 arraysize(kWebRtcDevSwitchNames)); | 2970 arraysize(kWebRtcDevSwitchNames)); |
2971 } | 2971 } |
2972 } | 2972 } |
2973 #endif // defined(ENABLE_WEBRTC) | 2973 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |