| 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 CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ | 6 #define CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <map> | 10 #include <map> |
| 9 #include <string> | 11 #include <string> |
| 10 #include <vector> | 12 #include <vector> |
| 11 | 13 |
| 12 #include "base/basictypes.h" | |
| 13 #include "base/containers/hash_tables.h" | 14 #include "base/containers/hash_tables.h" |
| 14 #include "base/containers/scoped_ptr_hash_map.h" | 15 #include "base/containers/scoped_ptr_hash_map.h" |
| 16 #include "base/macros.h" |
| 15 #include "media/base/cdm_context.h" | 17 #include "media/base/cdm_context.h" |
| 16 #include "media/base/cdm_factory.h" | 18 #include "media/base/cdm_factory.h" |
| 17 #include "media/base/cdm_promise.h" | 19 #include "media/base/cdm_promise.h" |
| 18 #include "media/base/cdm_promise_adapter.h" | 20 #include "media/base/cdm_promise_adapter.h" |
| 19 #include "media/base/media_keys.h" | 21 #include "media/base/media_keys.h" |
| 20 | 22 |
| 21 class GURL; | 23 class GURL; |
| 22 | 24 |
| 23 namespace content { | 25 namespace content { |
| 24 | 26 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 media::SessionExpirationUpdateCB session_expiration_update_cb_; | 116 media::SessionExpirationUpdateCB session_expiration_update_cb_; |
| 115 | 117 |
| 116 media::CdmPromiseAdapter cdm_promise_adapter_; | 118 media::CdmPromiseAdapter cdm_promise_adapter_; |
| 117 | 119 |
| 118 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); | 120 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); |
| 119 }; | 121 }; |
| 120 | 122 |
| 121 } // namespace content | 123 } // namespace content |
| 122 | 124 |
| 123 #endif // CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ | 125 #endif // CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ |
| OLD | NEW |