| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_CDM_PROXY_DECRYPTOR_H_ | 5 #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_ |
| 6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_ | 6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 bool granted); | 108 bool granted); |
| 109 | 109 |
| 110 enum SessionCreationType { | 110 enum SessionCreationType { |
| 111 TemporarySession, | 111 TemporarySession, |
| 112 PersistentSession, | 112 PersistentSession, |
| 113 LoadSession | 113 LoadSession |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 // Called when a session is actually created or loaded. | 116 // Called when a session is actually created or loaded. |
| 117 void SetSessionId(SessionCreationType session_type, | 117 void SetSessionId(SessionCreationType session_type, |
| 118 const std::string& possible_session_id, |
| 118 const std::string& session_id); | 119 const std::string& session_id); |
| 119 | 120 |
| 120 struct PendingGenerateKeyRequestData { | 121 struct PendingGenerateKeyRequestData { |
| 121 PendingGenerateKeyRequestData(EmeInitDataType init_data_type, | 122 PendingGenerateKeyRequestData(EmeInitDataType init_data_type, |
| 122 const std::vector<uint8>& init_data); | 123 const std::vector<uint8>& init_data); |
| 123 ~PendingGenerateKeyRequestData(); | 124 ~PendingGenerateKeyRequestData(); |
| 124 | 125 |
| 125 const EmeInitDataType init_data_type; | 126 const EmeInitDataType init_data_type; |
| 126 const std::vector<uint8> init_data; | 127 const std::vector<uint8> init_data; |
| 127 }; | 128 }; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 154 | 155 |
| 155 // NOTE: Weak pointers must be invalidated before all other member variables. | 156 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 156 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_; | 157 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_; |
| 157 | 158 |
| 158 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); | 159 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); |
| 159 }; | 160 }; |
| 160 | 161 |
| 161 } // namespace media | 162 } // namespace media |
| 162 | 163 |
| 163 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_ | 164 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_ |
| OLD | NEW |