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

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

Issue 8491044: Link things together and enable the device selection for linux and mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: rebase2 Created 9 years, 1 month 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_input_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c8c6014b57c4c1f3a549a7f529720be68237d614..72196d71e6025b2827cfb91a1cab763155597220 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.h
+++ b/content/browser/renderer_host/media/audio_input_device_manager.h
@@ -31,9 +31,9 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
// even though Open() has not been called. This is used to be able to use the
// AudioInputDeviceManager before MediaStream is implemented.
static const int kFakeOpenSessionId;
+
static const int kInvalidSessionId;
- static const int kInvalidDevice;
- static const int kDefaultDeviceIndex;
+ static const char kInvalidDeviceId[];
AudioInputDeviceManager();
virtual ~AudioInputDeviceManager();
@@ -70,7 +70,7 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
void ErrorOnIOThread(int session_id, MediaStreamProviderError error);
// Executed on IO thread to call the event handler.
- void StartedOnIOThread(int session_id, int index);
+ void StartedOnIOThread(int session_id, const std::string& device_id);
void StoppedOnIOThread(int session_id);
// Executed on audio_input_device_thread_ to make sure
« no previous file with comments | « no previous file | 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