| 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_BASE_CDM_CALLBACK_PROMISE_H_ | 5 #ifndef MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ |
| 6 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ | 6 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/callback.h" | 12 #include "base/callback.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "media/base/cdm_promise.h" | 14 #include "media/base/cdm_promise.h" |
| 15 // TODO(xhwang): Remove this include after http://crbug.com/656706 is fixed. | |
| 16 #include "media/base/content_decryption_module.h" | |
| 17 #include "media/base/media_export.h" | 15 #include "media/base/media_export.h" |
| 18 | 16 |
| 19 namespace media { | 17 namespace media { |
| 20 | 18 |
| 21 typedef base::OnceCallback<void(CdmPromise::Exception exception_code, | 19 typedef base::OnceCallback<void(CdmPromise::Exception exception_code, |
| 22 uint32_t system_code, | 20 uint32_t system_code, |
| 23 const std::string& error_message)> | 21 const std::string& error_message)> |
| 24 PromiseRejectedCB; | 22 PromiseRejectedCB; |
| 25 | 23 |
| 26 template <typename... T> | 24 template <typename... T> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 43 | 41 |
| 44 base::OnceCallback<void(const T&...)> resolve_cb_; | 42 base::OnceCallback<void(const T&...)> resolve_cb_; |
| 45 PromiseRejectedCB reject_cb_; | 43 PromiseRejectedCB reject_cb_; |
| 46 | 44 |
| 47 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise); | 45 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise); |
| 48 }; | 46 }; |
| 49 | 47 |
| 50 } // namespace media | 48 } // namespace media |
| 51 | 49 |
| 52 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ | 50 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ |
| OLD | NEW |