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

Unified Diff: media/mojo/services/mojo_cdm.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/media.gyp ('k') | media/mojo/services/mojo_cdm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm.h
diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h
index 4c29577139ce5a4e7f9f5d1c3f4ac72ec4ad586d..68667dab6ccfa3b4c1150c98e972e4667d176431 100644
--- a/media/mojo/services/mojo_cdm.h
+++ b/media/mojo/services/mojo_cdm.h
@@ -5,6 +5,8 @@
#ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_H_
#define MEDIA_MOJO_SERVICES_MOJO_CDM_H_
+#include <vector>
+
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "media/base/media_keys.h"
@@ -33,21 +35,18 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
~MojoCdm() final;
// MediaKeys implementation.
- void SetServerCertificate(const uint8_t* certificate_data,
- int certificate_data_length,
+ void SetServerCertificate(const std::vector<uint8_t>& certificate,
scoped_ptr<SimpleCdmPromise> promise) final;
void CreateSessionAndGenerateRequest(
SessionType session_type,
EmeInitDataType init_data_type,
- const uint8_t* init_data,
- int init_data_length,
+ const std::vector<uint8_t>& init_data,
scoped_ptr<NewSessionCdmPromise> promise) final;
void LoadSession(SessionType session_type,
const std::string& session_id,
scoped_ptr<NewSessionCdmPromise> promise) final;
void UpdateSession(const std::string& session_id,
- const uint8_t* response,
- int response_length,
+ const std::vector<uint8_t>& response,
scoped_ptr<SimpleCdmPromise> promise) final;
void CloseSession(const std::string& session_id,
scoped_ptr<SimpleCdmPromise> promise) final;
« no previous file with comments | « media/media.gyp ('k') | media/mojo/services/mojo_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698