Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

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

Issue 68683009: Rewrite include paths for Blink public/ headers that have moved (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
OLDNEW
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/cdm/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/WebMediaPlayerClient.h"
15 #include "third_party/WebKit/public/platform/WebString.h" 16 #include "third_party/WebKit/public/platform/WebString.h"
16 #include "third_party/WebKit/public/web/WebFrame.h" 17 #include "third_party/WebKit/public/web/WebFrame.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"
20 #include "content/renderer/media/android/renderer_media_player_manager.h" 20 #include "content/renderer/media/android/renderer_media_player_manager.h"
21 #endif // defined(ENABLE_PEPPER_CDMS) 21 #endif // defined(ENABLE_PEPPER_CDMS)
22 22
23 namespace content { 23 namespace content {
24 24
25 #if defined(ENABLE_PEPPER_CDMS) 25 #if defined(ENABLE_PEPPER_CDMS)
26 // Returns the PepperPluginInstanceImpl associated with the Helper Plugin. 26 // Returns the PepperPluginInstanceImpl associated with the Helper Plugin.
27 // If a non-NULL pointer is returned, the caller must call 27 // If a non-NULL pointer is returned, the caller must call
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 scoped_ptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys( 119 scoped_ptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys(
120 manager, media_keys_id, key_added_cb, key_error_cb, key_message_cb)); 120 manager, media_keys_id, key_added_cb, key_error_cb, key_message_cb));
121 proxy_media_keys->InitializeCDM(key_system, frame_url); 121 proxy_media_keys->InitializeCDM(key_system, frame_url);
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
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/texttrack_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698