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

Unified Diff: media/base/media_keys.h

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/cdm_key_information.cc ('k') | media/blink/cdm_session_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_keys.h
diff --git a/media/base/media_keys.h b/media/base/media_keys.h
index bdc41c5a4d784b0dc0550aba0265417e83054085..997053a7a5b275d1c8655c1de31c1a59bcb2dfd7 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
#include "media/base/media_export.h"
#include "url/gurl.h"
@@ -21,12 +22,14 @@ class Time;
namespace media {
class CdmContext;
+struct CdmKeyInformation;
template <typename... T>
class CdmPromiseTemplate;
typedef CdmPromiseTemplate<std::string> NewSessionCdmPromise;
typedef CdmPromiseTemplate<> SimpleCdmPromise;
+typedef ScopedVector<CdmKeyInformation> CdmKeysInfo;
// Performs media key operations.
//
@@ -136,8 +139,8 @@ typedef base::Callback<void(const std::string& web_session_id,
const std::string& error_message)> SessionErrorCB;
typedef base::Callback<void(const std::string& web_session_id,
- bool has_additional_usable_key)>
- SessionKeysChangeCB;
+ bool has_additional_usable_key,
+ CdmKeysInfo keys_info)> SessionKeysChangeCB;
typedef base::Callback<void(const std::string& web_session_id,
const base::Time& new_expiry_time)>
« no previous file with comments | « media/base/cdm_key_information.cc ('k') | media/blink/cdm_session_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698