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

Unified Diff: media/base/media_keys.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/base/fake_text_track_stream.h ('k') | media/base/mock_audio_renderer_sink.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 796d78d6e8a63f82c75277e69618fecaa414fa64..ba2a680d39f86749e6b6a622694b6856a575070f 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -89,8 +89,7 @@ class MEDIA_EXPORT MediaKeys{
// Provides a server certificate to be used to encrypt messages to the
// license server.
- virtual void SetServerCertificate(const uint8* certificate_data,
- int certificate_data_length,
+ virtual void SetServerCertificate(const std::vector<uint8_t>& certificate,
scoped_ptr<SimpleCdmPromise> promise) = 0;
// Creates a session with |session_type|. Then generates a request with the
@@ -105,8 +104,7 @@ class MEDIA_EXPORT MediaKeys{
virtual 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) = 0;
// Loads a session with the |session_id| provided.
@@ -118,8 +116,7 @@ class MEDIA_EXPORT MediaKeys{
// Updates a session specified by |session_id| with |response|.
virtual void UpdateSession(const std::string& session_id,
- const uint8* response,
- int response_length,
+ const std::vector<uint8_t>& response,
scoped_ptr<SimpleCdmPromise> promise) = 0;
// Closes the session specified by |session_id|. The CDM should resolve or
@@ -151,7 +148,7 @@ class MEDIA_EXPORT MediaKeys{
typedef base::Callback<void(const std::string& session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8>& message,
+ const std::vector<uint8_t>& message,
const GURL& legacy_destination_url)>
SessionMessageCB;
@@ -163,7 +160,7 @@ typedef base::Callback<void(const std::string& session_id)> SessionClosedCB;
typedef base::Callback<void(const std::string& session_id,
MediaKeys::Exception exception,
- uint32 system_code,
+ uint32_t system_code,
const std::string& error_message)>
LegacySessionErrorCB;
« no previous file with comments | « media/base/fake_text_track_stream.h ('k') | media/base/mock_audio_renderer_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698