| commit | 5bc74f5fff976f92f3b9ff3a71c9d1d8ffc58802 | [log] [tgz] |
|---|---|---|
| author | Max Morin <[email protected]> | Wed May 09 07:00:21 2018 |
| committer | Commit Bot <[email protected]> | Wed May 09 07:00:21 2018 |
| tree | a97f6466bc76c956530ed578a89b1b26588fdc35 | |
| parent | ae1c78ac423318da38fec24f51bdaaae134cd918 [diff] [blame] |
Add ForwardingAudioStreamFactory to WebContentsImpl. Also add accessor to ForwardingAudioStreamFactory. Approximate diagram of stuff: https://docs.google.com/drawings/d/1_ZIKj6lihGKRjq4Mflduitmkn_REqpHFeqVNelBGHHk/edit Bug: 830493 Change-Id: I309aedf43fed5e646545eb94d00a77abc6ac66ea Reviewed-on: https://chromium-review.googlesource.com/1039707 Reviewed-by: Nasko Oskov <[email protected]> Reviewed-by: Olga Sharonova <[email protected]> Commit-Queue: Max Morin <[email protected]> Cr-Commit-Position: refs/heads/master@{#557111}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 189b3f0..6a9a264 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -60,6 +60,7 @@ #include "content/browser/loader/loader_io_thread_notifier.h" #include "content/browser/loader/resource_dispatcher_host_impl.h" #include "content/browser/manifest/manifest_manager_host.h" +#include "content/browser/media/audio_stream_broker.h" #include "content/browser/media/audio_stream_monitor.h" #include "content/browser/media/capture/web_contents_audio_muter.h" #include "content/browser/media/media_web_contents_observer.h" @@ -6158,6 +6159,19 @@ view_size_before_emulation_ = gfx::Size(); } +ForwardingAudioStreamFactory* WebContentsImpl::GetAudioStreamFactory() { + if (!audio_stream_factory_) { + audio_stream_factory_.emplace( + this, + content::ServiceManagerConnection::GetForProcess() + ->GetConnector() + ->Clone(), + AudioStreamBrokerFactory::CreateImpl()); + } + + return &*audio_stream_factory_; +} + void WebContentsImpl::MediaStartedPlaying( const WebContentsObserver::MediaPlayerInfo& media_info, const WebContentsObserver::MediaPlayerId& id) {