content/renderer/media/crypto/encrypted_media_player_support_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/media/crypto/encrypted_media_player_support_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/crypto/encrypted_media_player_support.cc ('k') | content/renderer/media/crypto/encrypted_media_player_support_impl.cc » ('j') | media/blink/buffered_resource_loader_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/crypto/encrypted_media_player_support_impl.h

diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.h b/content/renderer/media/crypto/encrypted_media_player_support_impl.h

index 76063e62c900608a4e4d19b80cdc3e92226108c3..f0299d84d09f8e0cdd347e0da5728934b92cfc9c 100644

--- a/content/renderer/media/crypto/encrypted_media_player_support_impl.h

+++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.h

@@ -9,8 +9,8 @@

#include <vector>

#include "base/memory/weak_ptr.h"

-#include "content/renderer/media/crypto/encrypted_media_player_support.h"

#include "content/renderer/media/crypto/proxy_decryptor.h"

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

namespace blink {

class WebMediaPlayerClient;

@@ -21,7 +21,7 @@ namespace content {

class WebContentDecryptionModuleImpl;

class EncryptedMediaPlayerSupportImpl

- : public EncryptedMediaPlayerSupport,

+ : public media::EncryptedMediaPlayerSupport,

public base::SupportsWeakPtr<EncryptedMediaPlayerSupportImpl> {

public:

static scoped_ptr<EncryptedMediaPlayerSupport> Create(