Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.h

Issue 2697793002: Add mojo interface+impl for audio stream control. (Closed)
Patch Set: Don't inline AudioOutputDelegate(EventHandler) dtor. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_renderer_host.h
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 0d0ca36b3ea711a4bf5f7b3aaca89bb47b10abf0..c680bfa850890369e517909562e4c290611a5bbe 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -47,10 +47,10 @@
#include <vector>
#include "content/browser/renderer_host/media/audio_output_authorization_handler.h"
-#include "content/browser/renderer_host/media/audio_output_delegate.h"
#include "content/common/content_export.h"
#include "content/public/browser/browser_message_filter.h"
#include "content/public/browser/render_process_host.h"
+#include "media/audio/audio_output_delegate.h"
namespace base {
class SharedMemory;
@@ -69,7 +69,7 @@ class MediaStreamManager;
class CONTENT_EXPORT AudioRendererHost
: public BrowserMessageFilter,
- public AudioOutputDelegate::EventHandler {
+ public media::AudioOutputDelegate::EventHandler {
public:
// Called from UI thread from the owner of this object.
AudioRendererHost(int render_process_id,
@@ -110,7 +110,7 @@ class CONTENT_EXPORT AudioRendererHost
typedef base::Callback<void(bool have_access)> OutputDeviceAccessCB;
using AudioOutputDelegateVector =
- std::vector<std::unique_ptr<AudioOutputDelegate>>;
+ std::vector<std::unique_ptr<media::AudioOutputDelegate>>;
// The type of a function that is run on the UI thread to check whether the
// routing IDs reference a valid RenderFrameHost. The function then runs
@@ -186,7 +186,7 @@ class CONTENT_EXPORT AudioRendererHost
// Returns delegates_.end() if not found.
AudioOutputDelegateVector::iterator LookupIteratorById(int stream_id);
// Returns nullptr if not found.
- AudioOutputDelegate* LookupById(int stream_id);
+ media::AudioOutputDelegate* LookupById(int stream_id);
// Helper method to check if the authorization procedure for stream
// |stream_id| has started.

Powered by Google App Engine
This is Rietveld 408576698