content/renderer/render_frame_impl.h - Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink.

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/render_frame_impl.h

Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Exclude media/blink from Android GN builds for now like cc/blink does. Created 6 years, 3 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/content_shell.gypi ('K') | « content/renderer/media/websourcebuffer_impl.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | media/blink/buffered_resource_loader_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.h

diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h

index 1d9afb8c82e2bd785d4bf85e5748abf0a5ee0457..a3371ef20f89e9cbaf2d6b5d06f79623285f4818 100644

--- a/content/renderer/render_frame_impl.h

+++ b/content/renderer/render_frame_impl.h

@@ -19,10 +19,10 @@

#include "content/public/common/javascript_message_type.h"

#include "content/public/common/referrer.h"

#include "content/public/renderer/render_frame.h"

-#include "content/renderer/media/webmediaplayer_delegate.h"

#include "content/renderer/render_frame_proxy.h"

#include "content/renderer/renderer_webcookiejar_impl.h"

#include "ipc/ipc_message.h"

+#include "media/blink/webmediaplayer_delegate.h"

#include "third_party/WebKit/public/web/WebAXObject.h"

#include "third_party/WebKit/public/web/WebDataSource.h"

#include "third_party/WebKit/public/web/WebFrameClient.h"

@@ -83,7 +83,7 @@ struct CustomContextMenuContext;

class CONTENT_EXPORT RenderFrameImpl

: public RenderFrame,

NON_EXPORTED_BASE(public blink::WebFrameClient),

- NON_EXPORTED_BASE(public WebMediaPlayerDelegate) {

+ NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {

public:

// Creates a new RenderFrame. |render_view| is the RenderView object that this

// frame belongs to.