content/renderer/media/crypto/content_decryption_module_factory.cc - Issue 22362007: Relocate last remnants of webkit/renderer/media code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/renderer/media/crypto/content_decryption_module_factory.cc

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make chromeos crypto dep explicit. Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/content_tests.gypi ('k') | media/cdm/DEPS » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/renderer/media/crypto/content_decryption_module_factory.h"	5 #include "content/renderer/media/crypto/content_decryption_module_factory.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "content/renderer/media/crypto/key_systems.h"	8 #include "content/renderer/media/crypto/key_systems.h"

9 #include "media/crypto/aes_decryptor.h"	9 #include "media/cdm/aes_decryptor.h"

10	10

11 #if defined(ENABLE_PEPPER_CDMS)	11 #if defined(ENABLE_PEPPER_CDMS)

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

13 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"	13 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"

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

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

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

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

18 #elif defined(OS_ANDROID)	18 #elif defined(OS_ANDROID)

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

(...skipping 99 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 scoped_ptr<ProxyMediaKeys> proxy_media_keys(	119 scoped_ptr<ProxyMediaKeys> proxy_media_keys(

120 new ProxyMediaKeys(proxy, media_keys_id));	120 new ProxyMediaKeys(proxy, media_keys_id));

121 proxy_media_keys->InitializeCDM(key_system);	121 proxy_media_keys->InitializeCDM(key_system);

122 return proxy_media_keys.PassAs<media::MediaKeys>();	122 return proxy_media_keys.PassAs<media::MediaKeys>();

123 #else	123 #else

124 return scoped_ptr<media::MediaKeys>();	124 return scoped_ptr<media::MediaKeys>();

125 #endif // defined(ENABLE_PEPPER_CDMS)	125 #endif // defined(ENABLE_PEPPER_CDMS)

126 }	126 }

127	127

128 } // namespace content	128 } // namespace content

OLD	NEW