OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ | 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ |
6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ | 6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "media/base/cdm_promise.h" | 9 #include "media/base/cdm_promise.h" |
10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" | 10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 MojoCdmPromise(const CallbackType& callback); | 24 MojoCdmPromise(const CallbackType& callback); |
25 ~MojoCdmPromise() final; | 25 ~MojoCdmPromise() final; |
26 | 26 |
27 // CdmPromiseTemplate<> implementation. | 27 // CdmPromiseTemplate<> implementation. |
28 void resolve(const T&... result) final; | 28 void resolve(const T&... result) final; |
29 void reject(MediaKeys::Exception exception, | 29 void reject(MediaKeys::Exception exception, |
30 uint32_t system_code, | 30 uint32_t system_code, |
31 const std::string& error_message) final; | 31 const std::string& error_message) final; |
32 | 32 |
33 private: | 33 private: |
| 34 using media::CdmPromiseTemplate<T...>::MarkPromiseSettled; |
| 35 |
34 CallbackType callback_; | 36 CallbackType callback_; |
35 }; | 37 }; |
36 | 38 |
37 } // namespace media | 39 } // namespace media |
38 | 40 |
39 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ | 41 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ |
OLD | NEW |