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

Unified Diff: content/browser/renderer_host/media/audio_input_renderer_host.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_renderer_host.h
===================================================================
--- content/browser/renderer_host/media/audio_input_renderer_host.h (revision 130181)
+++ content/browser/renderer_host/media/audio_input_renderer_host.h (working copy)
@@ -68,10 +68,8 @@
class ResourceContext;
}
-namespace media {
class AudioManager;
class AudioParameters;
-}
class CONTENT_EXPORT AudioInputRendererHost
: public content::BrowserMessageFilter,
@@ -101,7 +99,7 @@
// Called from UI thread from the owner of this object.
AudioInputRendererHost(content::ResourceContext* resource_context,
- media::AudioManager* audio_manager);
+ AudioManager* audio_manager);
// content::BrowserMessageFilter implementation.
virtual void OnChannelClosing() OVERRIDE;
@@ -141,7 +139,7 @@
// successful this object would keep an internal entry of the stream for the
// required properties.
void OnCreateStream(int stream_id,
- const media::AudioParameters& params,
+ const AudioParameters& params,
const std::string& device_id,
bool automatic_gain_control);
@@ -199,7 +197,7 @@
// Used to get an instance of AudioInputDeviceManager.
content::ResourceContext* resource_context_;
- media::AudioManager* audio_manager_;
+ AudioManager* audio_manager_;
// A map of stream IDs to audio sources.
typedef std::map<int, AudioEntry*> AudioEntryMap;

Powered by Google App Engine
This is Rietveld 408576698