Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: media/base/media_keys.h

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_BASE_MEDIA_KEYS_H_ 5 #ifndef MEDIA_BASE_MEDIA_KEYS_H_
6 #define MEDIA_BASE_MEDIA_KEYS_H_ 6 #define MEDIA_BASE_MEDIA_KEYS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 MediaKeys(); 132 MediaKeys();
133 133
134 private: 134 private:
135 DISALLOW_COPY_AND_ASSIGN(MediaKeys); 135 DISALLOW_COPY_AND_ASSIGN(MediaKeys);
136 }; 136 };
137 137
138 // Key event callbacks. See the spec for details: 138 // Key event callbacks. See the spec for details:
139 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted- media.html#event-summary 139 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted- media.html#event-summary
140 typedef base::Callback<void(const std::string& web_session_id, 140 typedef base::Callback<void(const std::string& web_session_id,
141 MediaKeys::MessageType message_type, 141 MediaKeys::MessageType message_type,
142 const std::vector<uint8>& message)> 142 const std::vector<uint8>& message,
143 const GURL& legacy_destination_url)>
143 SessionMessageCB; 144 SessionMessageCB;
144 145
145 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB; 146 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB;
146 147
147 typedef base::Callback<void(const std::string& web_session_id, 148 typedef base::Callback<void(const std::string& web_session_id,
148 MediaKeys::Exception exception_code, 149 MediaKeys::Exception exception_code,
149 uint32 system_code, 150 uint32 system_code,
150 const std::string& error_message)> SessionErrorCB; 151 const std::string& error_message)> SessionErrorCB;
151 152
152 typedef base::Callback<void(const std::string& web_session_id, 153 typedef base::Callback<void(const std::string& web_session_id,
153 bool has_additional_usable_key, 154 bool has_additional_usable_key,
154 CdmKeysInfo keys_info)> SessionKeysChangeCB; 155 CdmKeysInfo keys_info)> SessionKeysChangeCB;
155 156
156 typedef base::Callback<void(const std::string& web_session_id, 157 typedef base::Callback<void(const std::string& web_session_id,
157 const base::Time& new_expiry_time)> 158 const base::Time& new_expiry_time)>
158 SessionExpirationUpdateCB; 159 SessionExpirationUpdateCB;
159 160
160 } // namespace media 161 } // namespace media
161 162
162 #endif // MEDIA_BASE_MEDIA_KEYS_H_ 163 #endif // MEDIA_BASE_MEDIA_KEYS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698