content/renderer/media/crypto/content_decryption_module_factory.cc - Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper.

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/content_decryption_module_factory.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: more more clang fun Created 7 years, 5 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/renderer/media/crypto/content_decryption_module_factory.cc

===================================================================

--- content/renderer/media/crypto/content_decryption_module_factory.cc (revision 213561)

+++ content/renderer/media/crypto/content_decryption_module_factory.cc (working copy)

@@ -10,11 +10,11 @@

#if defined(ENABLE_PEPPER_CDMS)

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

+#include "content/renderer/pepper/ppapi_plugin_instance_impl.h"

+#include "content/renderer/pepper/ppapi_webplugin_impl.h"

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

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

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

-#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"

-#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"

#elif defined(OS_ANDROID)

#include "content/renderer/media/android/proxy_media_keys.h"

#include "content/renderer/media/android/webmediaplayer_proxy_android.h"