| 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 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ | 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 class ContentDecryptionModuleFactory { | 23 class ContentDecryptionModuleFactory { |
| 24 public: | 24 public: |
| 25 // |create_pepper_cdm_cb| will be called synchronously if necessary. The other | 25 // |create_pepper_cdm_cb| will be called synchronously if necessary. The other |
| 26 // callbacks can be called asynchronously. | 26 // callbacks can be called asynchronously. |
| 27 static scoped_ptr<media::MediaKeys> Create( | 27 static scoped_ptr<media::MediaKeys> Create( |
| 28 const std::string& key_system, | 28 const std::string& key_system, |
| 29 #if defined(ENABLE_PEPPER_CDMS) | 29 #if defined(ENABLE_PEPPER_CDMS) |
| 30 const CreatePepperCdmCB& create_pepper_cdm_cb, | 30 const CreatePepperCdmCB& create_pepper_cdm_cb, |
| 31 #elif defined(OS_ANDROID) | 31 #elif defined(OS_ANDROID) |
| 32 RendererMediaPlayerManager* manager, | 32 RendererMediaPlayerManager* manager, |
| 33 int cdm_id, | |
| 34 const GURL& frame_url, | 33 const GURL& frame_url, |
| 34 int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys. |
| 35 #endif // defined(ENABLE_PEPPER_CDMS) | 35 #endif // defined(ENABLE_PEPPER_CDMS) |
| 36 const media::SessionCreatedCB& session_created_cb, | 36 const media::SessionCreatedCB& session_created_cb, |
| 37 const media::SessionMessageCB& session_message_cb, | 37 const media::SessionMessageCB& session_message_cb, |
| 38 const media::SessionReadyCB& session_ready_cb, | 38 const media::SessionReadyCB& session_ready_cb, |
| 39 const media::SessionClosedCB& session_closed_cb, | 39 const media::SessionClosedCB& session_closed_cb, |
| 40 const media::SessionErrorCB& session_error_cb); | 40 const media::SessionErrorCB& session_error_cb); |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 } // namespace content | 43 } // namespace content |
| 44 | 44 |
| 45 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ | 45 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ |
| OLD | NEW |