Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h - Issue 16778002: MediaStream API: Changing the device enumeration to be async

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: Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h

Issue 16778002: MediaStream API: Changing the device enumeration to be async (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: merge Created 7 years, 6 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

« Source/modules/mediastream/MediaStreamTrackSourcesRequest.cpp ('K') | « Source/modules/modules.gypi ('k') | Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h

diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h b/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h

index 11f4c54c2c4d866033357f716df154a522a6e779..e8694b9c76528b83fe2029386fb67c1bc7c30cec 100644

--- a/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h

+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h

@@ -44,7 +44,7 @@ class MockWebMediaStreamCenter : public WebKit::WebMediaStreamCenter {

public:

explicit MockWebMediaStreamCenter(WebKit::WebMediaStreamCenterClient*);

- virtual bool getSourceInfos(const WebKit::WebString& url, WebKit::WebVector<WebKit::WebSourceInfo>&) OVERRIDE;

+ virtual bool getMediaStreamTrackSources(const WebKit::WebMediaStreamTrackSourcesRequest&) OVERRIDE;

virtual void didEnableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;

virtual void didDisableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;

virtual bool didAddMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;