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

Side by Side Diff: content/renderer/media/media_stream_dispatcher.h

Issue 2684233005: Revert of Use spec-compliant algorithm to select video devices in getUserMedia. (Closed)
Patch Set: Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 27 matching lines...) Expand all
38 explicit MediaStreamDispatcher(RenderFrame* render_frame); 38 explicit MediaStreamDispatcher(RenderFrame* render_frame);
39 ~MediaStreamDispatcher() override; 39 ~MediaStreamDispatcher() override;
40 40
41 // Request a new media stream to be created. 41 // Request a new media stream to be created.
42 // This can be used either by WebKit or a plugin. 42 // This can be used either by WebKit or a plugin.
43 // Note: The event_handler must be valid for as long as the stream exists. 43 // Note: The event_handler must be valid for as long as the stream exists.
44 virtual void GenerateStream( 44 virtual void GenerateStream(
45 int request_id, 45 int request_id,
46 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, 46 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
47 const StreamControls& controls, 47 const StreamControls& controls,
48 const url::Origin& security_origin, 48 const url::Origin& security_origin);
49 bool is_processing_user_gesture);
50 49
51 // Cancel the request for a new media stream to be created. 50 // Cancel the request for a new media stream to be created.
52 virtual void CancelGenerateStream( 51 virtual void CancelGenerateStream(
53 int request_id, 52 int request_id,
54 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler); 53 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler);
55 54
56 // Stop a started device that has been requested by calling GenerateStream. 55 // Stop a started device that has been requested by calling GenerateStream.
57 virtual void StopStreamDevice(const StreamDeviceInfo& device_info); 56 virtual void StopStreamDevice(const StreamDeviceInfo& device_info);
58 57
59 // Request to open a device. 58 // Request to open a device.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // been canceled. 126 // been canceled.
128 typedef std::list<Request> RequestList; 127 typedef std::list<Request> RequestList;
129 RequestList requests_; 128 RequestList requests_;
130 129
131 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher); 130 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher);
132 }; 131 };
133 132
134 } // namespace content 133 } // namespace content
135 134
136 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_ 135 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
OLDNEW
« no previous file with comments | « content/browser/webrtc/webrtc_getusermedia_browsertest.cc ('k') | content/renderer/media/media_stream_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698