content/shell/renderer/shell_content_renderer_client.h - Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/.

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/shell/renderer/shell_content_renderer_client.h

Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« content/public/renderer/video_frame_provider.h ('K') | « content/renderer/renderer_webkitplatformsupport_impl.cc ('k') | content/shell/renderer/shell_content_renderer_client.cc » ('j') | content/shell/renderer/shell_media_stream_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/shell_content_renderer_client.h

diff --git a/content/shell/renderer/shell_content_renderer_client.h b/content/shell/renderer/shell_content_renderer_client.h

index 373f3205d439ae615b939884ffc30a990e80c848..70c1ffc8388af8a9522ba1c44082f8f0a31078b8 100644

--- a/content/shell/renderer/shell_content_renderer_client.h

+++ b/content/shell/renderer/shell_content_renderer_client.h

@@ -53,8 +53,7 @@ class ShellContentRendererClient : public ContentRendererClient {

virtual WebKit::WebRTCPeerConnectionHandler*

OverrideCreateWebRTCPeerConnectionHandler(

WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;

- virtual webkit_media::MediaStreamClient* OverrideCreateMediaStreamClient()

- OVERRIDE;

+ virtual MediaStreamClient* OverrideCreateMediaStreamClient() OVERRIDE;

virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(

WebKit::WebMIDIAccessorClient* client) OVERRIDE;

virtual WebKit::WebClipboard* OverrideWebClipboard() OVERRIDE;