content/shell/renderer/shell_content_renderer_client.h - Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/.

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 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase on mo time 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:

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 7b8384f07e82d33bf3abce028bf75483479c4d62..373f3205d439ae615b939884ffc30a990e80c848 100644

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

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

@@ -28,6 +28,7 @@ class MockWebClipboardImpl;

namespace content {

+class ShellMediaStreamClient;

class ShellRenderProcessObserver;

class ShellContentRendererClient : public ContentRendererClient {

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

virtual WebKit::WebRTCPeerConnectionHandler*

OverrideCreateWebRTCPeerConnectionHandler(

WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;

+ virtual webkit_media::MediaStreamClient* OverrideCreateMediaStreamClient()

+ OVERRIDE;

virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(

WebKit::WebMIDIAccessorClient* client) OVERRIDE;

virtual WebKit::WebClipboard* OverrideWebClipboard() OVERRIDE;

@@ -64,6 +67,7 @@ class ShellContentRendererClient : public ContentRendererClient {

void WebTestProxyCreated(RenderView* render_view,

WebTestRunner::WebTestProxyBase* proxy);

+ scoped_ptr<ShellMediaStreamClient> shell_media_stream_client_;

scoped_ptr<ShellRenderProcessObserver> shell_observer_;

scoped_ptr<MockWebClipboardImpl> clipboard_;

scoped_ptr<webkit_glue::MockWebHyphenator> hyphenator_;