| 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 <stdint.h> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "media/base/cdm_promise.h" | 11 #include "media/base/cdm_promise.h" |
| 10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" | 12 #include "media/mojo/interfaces/content_decryption_module.mojom.h" |
| 11 #include "media/mojo/services/mojo_type_trait.h" | 13 #include "media/mojo/services/mojo_type_trait.h" |
| 12 #include "mojo/public/cpp/bindings/callback.h" | 14 #include "mojo/public/cpp/bindings/callback.h" |
| 13 | 15 |
| 14 namespace media { | 16 namespace media { |
| 15 | 17 |
| 16 // media::CdmPromiseTemplate implementations backed by mojo::Callbacks. | 18 // media::CdmPromiseTemplate implementations backed by mojo::Callbacks. |
| 17 template <typename... T> | 19 template <typename... T> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 32 | 34 |
| 33 private: | 35 private: |
| 34 using media::CdmPromiseTemplate<T...>::MarkPromiseSettled; | 36 using media::CdmPromiseTemplate<T...>::MarkPromiseSettled; |
| 35 | 37 |
| 36 CallbackType callback_; | 38 CallbackType callback_; |
| 37 }; | 39 }; |
| 38 | 40 |
| 39 } // namespace media | 41 } // namespace media |
| 40 | 42 |
| 41 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ | 43 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ |
| OLD | NEW |