| 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_PROMISE_H_ | 5 #ifndef MEDIA_BASE_CDM_PROMISE_H_ |
| 6 #define MEDIA_BASE_CDM_PROMISE_H_ | 6 #define MEDIA_BASE_CDM_PROMISE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 | 11 |
| 10 #include "base/logging.h" | 12 #include "base/logging.h" |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 13 #include "media/base/media_keys.h" | 15 #include "media/base/media_keys.h" |
| 14 | 16 |
| 15 namespace media { | 17 namespace media { |
| 16 | 18 |
| 17 // Interface for promises being resolved/rejected in response to various | 19 // Interface for promises being resolved/rejected in response to various |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 private: | 110 private: |
| 109 // Keep track of whether the promise has been resolved or rejected yet. | 111 // Keep track of whether the promise has been resolved or rejected yet. |
| 110 bool is_settled_; | 112 bool is_settled_; |
| 111 | 113 |
| 112 DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate); | 114 DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate); |
| 113 }; | 115 }; |
| 114 | 116 |
| 115 } // namespace media | 117 } // namespace media |
| 116 | 118 |
| 117 #endif // MEDIA_BASE_CDM_PROMISE_H_ | 119 #endif // MEDIA_BASE_CDM_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