| 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> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 | 11 |
| 10 #include "base/callback.h" | 12 #include "base/callback.h" |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 #include "media/base/cdm_promise.h" | 14 #include "media/base/cdm_promise.h" |
| 13 #include "media/base/media_export.h" | 15 #include "media/base/media_export.h" |
| 14 #include "media/base/media_keys.h" | 16 #include "media/base/media_keys.h" |
| 15 | 17 |
| 16 namespace media { | 18 namespace media { |
| 17 | 19 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 38 | 40 |
| 39 base::Callback<void(const T&...)> resolve_cb_; | 41 base::Callback<void(const T&...)> resolve_cb_; |
| 40 PromiseRejectedCB reject_cb_; | 42 PromiseRejectedCB reject_cb_; |
| 41 | 43 |
| 42 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise); | 44 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise); |
| 43 }; | 45 }; |
| 44 | 46 |
| 45 } // namespace media | 47 } // namespace media |
| 46 | 48 |
| 47 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ | 49 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master