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

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

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 164646)
+++ content/browser/renderer_host/media/audio_input_renderer_host.h (working copy)
@@ -68,23 +68,20 @@
class AudioParameters;
}
-namespace media_stream {
+namespace content {
class MediaStreamManager;
-}
-namespace content {
-
class CONTENT_EXPORT AudioInputRendererHost
: public BrowserMessageFilter,
public media::AudioInputController::EventHandler,
- public media_stream::AudioInputDeviceManagerEventHandler {
+ public AudioInputDeviceManagerEventHandler {
public:
// Called from UI thread from the owner of this object.
AudioInputRendererHost(
media::AudioManager* audio_manager,
- media_stream::MediaStreamManager* media_stream_manager);
+ MediaStreamManager* media_stream_manager);
- // content::BrowserMessageFilter implementation.
+ // BrowserMessageFilter implementation.
virtual void OnChannelClosing() OVERRIDE;
virtual void OnDestruct() const OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
@@ -99,7 +96,7 @@
const uint8* data,
uint32 size) OVERRIDE;
- // media_stream::AudioInputDeviceManagerEventHandler implementation.
+ // AudioInputDeviceManagerEventHandler implementation.
virtual void OnDeviceStarted(int session_id,
const std::string& device_id) OVERRIDE;
virtual void OnDeviceStopped(int session_id) OVERRIDE;
@@ -185,7 +182,7 @@
media::AudioManager* audio_manager_;
// Used to access to AudioInputDeviceManager.
- media_stream::MediaStreamManager* media_stream_manager_;
+ MediaStreamManager* media_stream_manager_;
// A map of stream IDs to audio sources.
AudioEntryMap audio_entries_;

Powered by Google App Engine
This is Rietveld 408576698