| 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)>
|
|
|