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

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

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simplify: Use only one AudioInputDeviceManager and VideoCaptureManager, like before. Created 8 years, 3 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 3f0b34c451f46cd043ab744b1d78ab7d60d7ca0c..4347ef108adf62cf260377d756aa7c57b8db987a 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.h
+++ b/content/browser/renderer_host/media/audio_input_device_manager.h
@@ -19,7 +19,7 @@
#include "content/browser/renderer_host/media/media_stream_provider.h"
#include "content/common/content_export.h"
#include "content/common/media/media_stream_options.h"
-#include "media/audio/audio_device_name.h"
+#include "content/public/common/media_stream_request.h"
namespace media {
class AudioManager;
@@ -29,9 +29,7 @@ namespace media_stream {
class AudioInputDeviceManagerEventHandler;
-class CONTENT_EXPORT AudioInputDeviceManager
- : public base::RefCountedThreadSafe<AudioInputDeviceManager>,
- public MediaStreamProvider {
+class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
public:
// Calling Start() with this kFakeOpenSessionId will open the default device,
// even though Open() has not been called. This is used to be able to use the
@@ -56,7 +54,6 @@ class CONTENT_EXPORT AudioInputDeviceManager
void Stop(int session_id);
private:
- friend class base::RefCountedThreadSafe<AudioInputDeviceManager>;
virtual ~AudioInputDeviceManager();
// Executed on media stream device thread.
@@ -66,8 +63,8 @@ class CONTENT_EXPORT AudioInputDeviceManager
// Executed on IO thread to call Listener.
void DevicesEnumeratedOnIOThread(StreamDeviceInfoArray* devices);
- void OpenedOnIOThread(int session_id);
- void ClosedOnIOThread(int session_id);
+ void OpenedOnIOThread(content::MediaStreamDeviceType type, int session_id);
+ void ClosedOnIOThread(content::MediaStreamDeviceType type, int session_id);
bool IsOnDeviceThread() const;
@@ -78,9 +75,9 @@ class CONTENT_EXPORT AudioInputDeviceManager
EventHandlerMap event_handlers_;
// Only accessed from media stream device thread.
- typedef std::map<int, media::AudioDeviceName> AudioInputDeviceMap;
- AudioInputDeviceMap devices_;
- media::AudioManager* audio_manager_;
+ typedef std::map<int, StreamDeviceInfo> StreamDeviceMap;
+ StreamDeviceMap devices_;
+ media::AudioManager* const audio_manager_;
// The message loop of media stream device thread that this object runs on.
scoped_refptr<base::MessageLoopProxy> device_loop_;

Powered by Google App Engine
This is Rietveld 408576698