Index: content/browser/renderer_host/render_process_host_impl.h |
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h |
index f5646797ab5f86e35d90d8b11ec2aecff41548aa..052d67c6672b76baf9bf3d46544239c1ac05af50 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.h |
+++ b/content/browser/renderer_host/render_process_host_impl.h |
@@ -21,6 +21,7 @@ |
#include "build/build_config.h" |
#include "content/browser/child_process_launcher.h" |
#include "content/browser/dom_storage/session_storage_namespace_impl.h" |
+#include "content/browser/media/webrtc/webrtc_eventlog_callback_handler.h" |
#include "content/browser/power_monitor_message_broadcaster.h" |
#include "content/common/content_export.h" |
#include "content/common/mojo/service_registry_impl.h" |
@@ -143,8 +144,6 @@ class CONTENT_EXPORT RenderProcessHostImpl |
#if defined(ENABLE_WEBRTC) |
ncarter (slow)
2016/05/18 21:49:56
These WebRTC calls don't really make sense in Rend
Ivo-OOO until feb 6
2016/05/20 14:58:48
You're absolutely right that it would be nicer be
|
void EnableAudioDebugRecordings(const base::FilePath& file) override; |
void DisableAudioDebugRecordings() override; |
- void EnableEventLogRecordings(const base::FilePath& file) override; |
- void DisableEventLogRecordings() override; |
void SetWebRtcLogMessageCallback( |
base::Callback<void(const std::string&)> callback) override; |
void ClearWebRtcLogMessageCallback() override; |
@@ -152,6 +151,24 @@ class CONTENT_EXPORT RenderProcessHostImpl |
bool incoming, |
bool outgoing, |
const WebRtcRtpPacketCallback& packet_callback) override; |
+ void RegisterEventLogHandler( |
+ const RenderProcessHost::EventLogStartFunc& start_logging_callback, |
+ const RenderProcessHost::EventLogStopFunc& stop_logging_callback) |
+ override; |
+ void RegisterPeerConnectionCallbacks( |
+ const RenderProcessHost::PeerConnectionAddedFunc& pc_added_callback, |
+ const RenderProcessHost::PeerConnectionRemovedFunc& pc_removed_callback) |
+ override; |
+ |
+ // Trigger the registered callback to start or stop the WebRTC event log. |
+ void SignalStartEventLog(const base::FilePath& file_path); |
+ void SignalStopEventLog(); |
+ |
+ // Trigger the registered callbacks to indicate a PeerConnection was added or |
+ // removed. |
+ void SignalPeerConnectionAdded(int connection_id); |
+ void SignalPeerConnectionRemoved(int connection_id); |
+ |
#endif |
void ResumeDeferredNavigation(const GlobalRequestID& request_id) override; |
void NotifyTimezoneChange(const std::string& timezone) override; |
@@ -341,24 +358,15 @@ class CONTENT_EXPORT RenderProcessHostImpl |
#if defined(ENABLE_WEBRTC) |
void OnRegisterAecDumpConsumer(int id); |
- void OnRegisterEventLogConsumer(int id); |
void OnUnregisterAecDumpConsumer(int id); |
- void OnUnregisterEventLogConsumer(int id); |
void RegisterAecDumpConsumerOnUIThread(int id); |
- void RegisterEventLogConsumerOnUIThread(int id); |
void UnregisterAecDumpConsumerOnUIThread(int id); |
- void UnregisterEventLogConsumerOnUIThread(int id); |
void EnableAecDumpForId(const base::FilePath& file, int id); |
- void EnableEventLogForId(const base::FilePath& file, int id); |
// Sends |file_for_transit| to the render process. |
void SendAecDumpFileToRenderer(int id, |
IPC::PlatformFileForTransit file_for_transit); |
- void SendEventLogFileToRenderer(int id, |
- IPC::PlatformFileForTransit file_for_transit); |
void SendDisableAecDumpToRenderer(); |
- void SendDisableEventLogToRenderer(); |
base::FilePath GetAecDumpFilePathWithExtensions(const base::FilePath& file); |
- base::FilePath GetEventLogFilePathWithExtensions(const base::FilePath& file); |
#endif |
std::unique_ptr<MojoChildConnection> mojo_child_connection_; |
@@ -479,6 +487,8 @@ class CONTENT_EXPORT RenderProcessHostImpl |
std::vector<int> aec_dump_consumers_; |
WebRtcStopRtpDumpCallback stop_rtp_dump_callback_; |
+ |
+ WebRTCEventLogCallbackHandler eventlog_callback_handler_; |
#endif |
int worker_ref_count_; |