content/renderer/media/media_stream_dispatcher.h - Issue 287383002: Implement getMediaDevices.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 287383002: Implement getMediaDevices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Code review fix, a minor test refactoring. And rebase, sorry. Created 6 years, 7 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:

Index: content/renderer/media/media_stream_dispatcher.h

diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h

index f63faad09a17eb79add77a2258cd751fa1addb7c..a52cb099d52501db3f92ba814428dedd2748e3ab 100644

--- a/content/renderer/media/media_stream_dispatcher.h

+++ b/content/renderer/media/media_stream_dispatcher.h

@@ -56,7 +56,7 @@ class CONTENT_EXPORT MediaStreamDispatcher

virtual void StopStreamDevice(const StreamDeviceInfo& device_info);

// Request to enumerate devices.

- void EnumerateDevices(

+ virtual void EnumerateDevices(

int request_id,

const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,

MediaStreamType type,

@@ -123,7 +123,6 @@ class CONTENT_EXPORT MediaStreamDispatcher

void OnDevicesEnumerated(

int request_id,

const StreamDeviceInfoArray& device_array);

- void OnDevicesEnumerationFailed(int request_id);

void OnDeviceOpened(

int request_id,

const std::string& label,