content/renderer/media/crypto/encrypted_media_player_support_impl.cc - 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.cc

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

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

« no previous file with comments | « content/renderer/media/crypto/encrypted_media_player_support_impl.h ('k') | content/renderer/media/test_response_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b15cd81adf31a403109658b4d0389673bdac4daa..c884cd6ac227e474860f42ee7685b7da6fafa21a 100644

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

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

@@ -16,6 +16,7 @@

#include "content/renderer/media/webcontentdecryptionmodule_impl.h"

#include "content/renderer/pepper/pepper_webplugin_impl.h"

#include "media/base/bind_to_current_loop.h"

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

#include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"

#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"

#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"

@@ -123,8 +124,8 @@ static std::string GuessInitDataType(const unsigned char* init_data,

return "video/mp4";

}

-scoped_ptr<EncryptedMediaPlayerSupport> EncryptedMediaPlayerSupportImpl::Create(

- blink::WebMediaPlayerClient* client) {

+scoped_ptr<media::EncryptedMediaPlayerSupport>

+EncryptedMediaPlayerSupportImpl::Create(blink::WebMediaPlayerClient* client) {

return scoped_ptr<EncryptedMediaPlayerSupport>(

new EncryptedMediaPlayerSupportImpl(client));

}