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

Unified Diff: content/renderer/media/media_stream_impl.h

Issue 8511074: test code for device enumeration from renderer process. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 8 years, 11 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
« no previous file with comments | « no previous file | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl.h
===================================================================
--- content/renderer/media/media_stream_impl.h (revision 118766)
+++ content/renderer/media/media_stream_impl.h (working copy)
@@ -71,6 +71,8 @@
MediaStreamDependencyFactory* dependency_factory);
virtual ~MediaStreamImpl();
+ virtual void GetVideoDevice(int size);
+
virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
WebKit::WebPeerConnectionHandlerClient* client);
virtual void ClosePeerConnection();
@@ -104,6 +106,15 @@
virtual void OnAudioDeviceFailed(
const std::string& label,
int index) OVERRIDE;
+ virtual void OnDevicesEnumerated(
+ int request_id,
+ const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE;
+ virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;
+ virtual void OnDeviceOpened(
+ int request_id,
+ const std::string& label,
+ const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
+ virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
private:
FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic);
@@ -155,6 +166,9 @@
std::list<std::string> stream_labels_;
+ int desired_size_;
+ std::string local_label_;
+
// Make sure we only create the video capture module once. This is also
// temporary and will be handled differently when several PeerConnections
// and/or streams is supported.
« no previous file with comments | « no previous file | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698