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_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ | 5 #ifndef MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ |
6 #define MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ | 6 #define MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ |
7 | 7 |
| 8 #include <stdint.h> |
| 9 |
8 #include <string> | 10 #include <string> |
9 | 11 |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "media/base/cdm_promise.h" | 13 #include "media/base/cdm_promise.h" |
12 #include "media/base/media_keys.h" | 14 #include "media/base/media_keys.h" |
13 #include "media/blink/media_blink_export.h" | 15 #include "media/blink/media_blink_export.h" |
14 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" | 16 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" |
15 | 17 |
16 namespace media { | 18 namespace media { |
17 | 19 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // Called on resolve() to convert the session ID into a SessionInitStatus to | 63 // Called on resolve() to convert the session ID into a SessionInitStatus to |
62 // be reported to blink. | 64 // be reported to blink. |
63 SessionInitializedCB new_session_created_cb_; | 65 SessionInitializedCB new_session_created_cb_; |
64 | 66 |
65 DISALLOW_COPY_AND_ASSIGN(NewSessionCdmResultPromise); | 67 DISALLOW_COPY_AND_ASSIGN(NewSessionCdmResultPromise); |
66 }; | 68 }; |
67 | 69 |
68 } // namespace media | 70 } // namespace media |
69 | 71 |
70 #endif // MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ | 72 #endif // MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ |
OLD | NEW |