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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 a50653151265ee37a6a4edee9d2f95e2ad949da6..cea2f3ada26f11c02c9d5fbb6ef8ce125c89ec8f 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -53,14 +53,16 @@
#include "media/audio/audio_output_controller.h"
#include "media/audio/simple_sources.h"
-class AudioManager;
-class AudioParameters;
-
namespace content {
class MediaObserver;
class ResourceContext;
} // namespace content
+namespace media {
+class AudioManager;
+class AudioParameters;
+}
+
class CONTENT_EXPORT AudioRendererHost
: public content::BrowserMessageFilter,
public media::AudioOutputController::EventHandler {
@@ -89,7 +91,7 @@ class CONTENT_EXPORT AudioRendererHost
typedef std::map<int, AudioEntry*> AudioEntryMap;
// Called from UI thread from the owner of this object.
- AudioRendererHost(AudioManager* audio_manager,
+ AudioRendererHost(media::AudioManager* audio_manager,
content::MediaObserver* media_observer);
// content::BrowserMessageFilter implementation.
@@ -121,7 +123,7 @@ class CONTENT_EXPORT AudioRendererHost
// Creates an audio output stream with the specified format. If this call is
// successful this object would keep an internal entry of the stream for the
// required properties.
- void OnCreateStream(int stream_id, const AudioParameters& params);
+ void OnCreateStream(int stream_id, const media::AudioParameters& params);
// Play the audio stream referenced by |stream_id|.
void OnPlayStream(int stream_id);
@@ -178,7 +180,7 @@ class CONTENT_EXPORT AudioRendererHost
// A map of stream IDs to audio sources.
AudioEntryMap audio_entries_;
- AudioManager* audio_manager_;
+ media::AudioManager* audio_manager_;
content::MediaObserver* media_observer_;
DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);

Powered by Google App Engine
This is Rietveld 408576698