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

Unified Diff: media/cdm/aes_decryptor.h

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 8 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/cast/sender/video_frame_factory.h ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor.h
diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h
index 5c7a06c2cc44a39af31bf2a4e649e5086dd1a01e..110abfb19b4eba6f962f9b7f47ccabbd6cff2ed8 100644
--- a/media/cdm/aes_decryptor.h
+++ b/media/cdm/aes_decryptor.h
@@ -7,6 +7,7 @@
#include <set>
#include <string>
+#include <vector>
#include "base/basictypes.h"
#include "base/containers/scoped_ptr_hash_map.h"
@@ -39,21 +40,18 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys,
~AesDecryptor() override;
// MediaKeys implementation.
- void SetServerCertificate(const uint8* certificate_data,
- int certificate_data_length,
+ void SetServerCertificate(const std::vector<uint8_t>& certificate,
scoped_ptr<SimpleCdmPromise> promise) override;
void CreateSessionAndGenerateRequest(
SessionType session_type,
EmeInitDataType init_data_type,
- const uint8* init_data,
- int init_data_length,
+ const std::vector<uint8_t>& init_data,
scoped_ptr<NewSessionCdmPromise> promise) override;
void LoadSession(SessionType session_type,
const std::string& session_id,
scoped_ptr<NewSessionCdmPromise> promise) override;
void UpdateSession(const std::string& session_id,
- const uint8* response,
- int response_length,
+ const std::vector<uint8_t>& response,
scoped_ptr<SimpleCdmPromise> promise) override;
void CloseSession(const std::string& session_id,
scoped_ptr<SimpleCdmPromise> promise) override;
@@ -149,7 +147,7 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys,
// Make session ID unique per renderer by making it static. Session
// IDs seen by the app will be "1", "2", etc.
- static uint32 next_session_id_;
+ static uint32_t next_session_id_;
NewKeyCB new_audio_key_cb_;
NewKeyCB new_video_key_cb_;
« no previous file with comments | « media/cast/sender/video_frame_factory.h ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698