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

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager.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_input_device_manager.h
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h
index 5c8a3961d79dd0dfdb778325295a54ee327875e4..96bff65679102dd59554b1e2d057e1223cf1c2c6 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.h
+++ b/content/browser/renderer_host/media/audio_input_device_manager.h
@@ -21,7 +21,9 @@
#include "content/common/media/media_stream_options.h"
#include "media/audio/audio_device_name.h"
+namespace media {
class AudioManager;
+}
namespace media_stream {
@@ -39,7 +41,7 @@ class CONTENT_EXPORT AudioInputDeviceManager
static const int kInvalidSessionId;
static const char kInvalidDeviceId[];
- explicit AudioInputDeviceManager(AudioManager* audio_manager);
+ explicit AudioInputDeviceManager(media::AudioManager* audio_manager);
// MediaStreamProvider implementation, called on IO thread.
virtual void Register(MediaStreamProviderListener* listener) OVERRIDE;
@@ -72,7 +74,7 @@ class CONTENT_EXPORT AudioInputDeviceManager
typedef std::map<int, media::AudioDeviceName> AudioInputDeviceMap;
AudioInputDeviceMap devices_;
// TODO(tommi): Is it necessary to store this as a member?
- AudioManager* audio_manager_;
+ media::AudioManager* audio_manager_;
DISALLOW_COPY_AND_ASSIGN(AudioInputDeviceManager);
};
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/renderer_host/media/audio_input_device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698