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

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.h

Issue 183743021: Implement MediaCaptureDevices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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: chrome/browser/media/media_capture_devices_dispatcher.h
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h
index cba839dc82d89062bbdc20b1343987afecd13b4f..83e8e990a0ced1521d302bdff3d79e363fee83e7 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.h
+++ b/chrome/browser/media/media_capture_devices_dispatcher.h
@@ -39,16 +39,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
public:
class Observer {
public:
- // Handle an information update consisting of a up-to-date audio capture
- // device lists. This happens when a microphone is plugged in or unplugged.
- virtual void OnUpdateAudioDevices(
- const content::MediaStreamDevices& devices) {}
-
- // Handle an information update consisting of a up-to-date video capture
- // device lists. This happens when a camera is plugged in or unplugged.
- virtual void OnUpdateVideoDevices(
- const content::MediaStreamDevices& devices) {}
-
// Handle an information update related to a media stream request.
virtual void OnRequestUpdate(
int render_process_id,
@@ -73,8 +63,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
// on destruction.
void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer);
- const content::MediaStreamDevices& GetAudioCaptureDevices();
- const content::MediaStreamDevices& GetVideoCaptureDevices();
// Method called from WebCapturerDelegate implementations to process access
// requests. |extension| is set to NULL if request was made from a drive-by
@@ -107,16 +95,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
const content::MediaStreamDevice* GetFirstAvailableAudioDevice();
const content::MediaStreamDevice* GetFirstAvailableVideoDevice();
- // Unittests that do not require actual device enumeration should call this
- // API on the singleton. It is safe to call this multiple times on the
- // signleton.
- void DisableDeviceEnumerationForTesting();
-
// Overridden from content::MediaObserver:
- virtual void OnAudioCaptureDevicesChanged(
- const content::MediaStreamDevices& devices) OVERRIDE;
- virtual void OnVideoCaptureDevicesChanged(
- const content::MediaStreamDevices& devices) OVERRIDE;
virtual void OnMediaRequestStateChanged(
int render_process_id,
int render_view_id,
@@ -197,8 +176,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
scoped_ptr<content::MediaStreamUI> ui);
// Called by the MediaObserver() functions, executed on UI thread.
- void UpdateAudioDevicesOnUIThread(const content::MediaStreamDevices& devices);
- void UpdateVideoDevicesOnUIThread(const content::MediaStreamDevices& devices);
void UpdateMediaRequestStateOnUIThread(
int render_process_id,
int render_view_id,
@@ -209,22 +186,9 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
void OnCreatingAudioStreamOnUIThread(int render_process_id,
int render_frame_id);
- // A list of cached audio capture devices.
- content::MediaStreamDevices audio_devices_;
-
- // A list of cached video capture devices.
- content::MediaStreamDevices video_devices_;
-
// A list of observers for the device update notifications.
ObserverList<Observer> observers_;
- // Flag to indicate if device enumeration has been done/doing.
- // Only accessed on UI thread.
- bool devices_enumerated_;
-
- // Flag used by unittests to disable device enumeration.
- bool is_device_enumeration_disabled_;
-
RequestsQueues pending_requests_;
scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;

Powered by Google App Engine
This is Rietveld 408576698