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

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

Issue 9965076: Revert 130180 - 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
===================================================================
--- content/browser/renderer_host/media/audio_input_device_manager.h (revision 130181)
+++ content/browser/renderer_host/media/audio_input_device_manager.h (working copy)
@@ -21,9 +21,7 @@
#include "content/common/media/media_stream_options.h"
#include "media/audio/audio_device_name.h"
-namespace media {
class AudioManager;
-}
namespace media_stream {
@@ -41,7 +39,7 @@
static const int kInvalidSessionId;
static const char kInvalidDeviceId[];
- explicit AudioInputDeviceManager(media::AudioManager* audio_manager);
+ explicit AudioInputDeviceManager(AudioManager* audio_manager);
// MediaStreamProvider implementation, called on IO thread.
virtual void Register(MediaStreamProviderListener* listener) OVERRIDE;
@@ -74,7 +72,7 @@
typedef std::map<int, media::AudioDeviceName> AudioInputDeviceMap;
AudioInputDeviceMap devices_;
// TODO(tommi): Is it necessary to store this as a member?
- media::AudioManager* audio_manager_;
+ 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