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

Side by Side Diff: content/renderer/media/crypto/proxy_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, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector>
10 11
11 #include "base/basictypes.h" 12 #include "base/basictypes.h"
12 #include "base/containers/hash_tables.h" 13 #include "base/containers/hash_tables.h"
13 #include "base/containers/scoped_ptr_hash_map.h" 14 #include "base/containers/scoped_ptr_hash_map.h"
14 #include "media/base/cdm_context.h" 15 #include "media/base/cdm_context.h"
15 #include "media/base/cdm_promise.h" 16 #include "media/base/cdm_promise.h"
16 #include "media/base/cdm_promise_adapter.h" 17 #include "media/base/cdm_promise_adapter.h"
17 #include "media/base/media_keys.h" 18 #include "media/base/media_keys.h"
18 19
19 class GURL; 20 class GURL;
(...skipping 12 matching lines...) Expand all
32 const media::SessionMessageCB& session_message_cb, 33 const media::SessionMessageCB& session_message_cb,
33 const media::SessionClosedCB& session_closed_cb, 34 const media::SessionClosedCB& session_closed_cb,
34 const media::LegacySessionErrorCB& legacy_session_error_cb, 35 const media::LegacySessionErrorCB& legacy_session_error_cb,
35 const media::SessionKeysChangeCB& session_keys_change_cb, 36 const media::SessionKeysChangeCB& session_keys_change_cb,
36 const media::SessionExpirationUpdateCB& session_expiration_update_cb); 37 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
37 38
38 ~ProxyMediaKeys() override; 39 ~ProxyMediaKeys() override;
39 40
40 // MediaKeys implementation. 41 // MediaKeys implementation.
41 void SetServerCertificate( 42 void SetServerCertificate(
42 const uint8* certificate_data, 43 const std::vector<uint8_t>& certificate,
43 int certificate_data_length,
44 scoped_ptr<media::SimpleCdmPromise> promise) override; 44 scoped_ptr<media::SimpleCdmPromise> promise) override;
45 void CreateSessionAndGenerateRequest( 45 void CreateSessionAndGenerateRequest(
46 SessionType session_type, 46 SessionType session_type,
47 media::EmeInitDataType init_data_type, 47 media::EmeInitDataType init_data_type,
48 const uint8* init_data, 48 const std::vector<uint8_t>& init_data,
49 int init_data_length,
50 scoped_ptr<media::NewSessionCdmPromise> promise) override; 49 scoped_ptr<media::NewSessionCdmPromise> promise) override;
51 void LoadSession(SessionType session_type, 50 void LoadSession(SessionType session_type,
52 const std::string& session_id, 51 const std::string& session_id,
53 scoped_ptr<media::NewSessionCdmPromise> promise) override; 52 scoped_ptr<media::NewSessionCdmPromise> promise) override;
54 void UpdateSession(const std::string& session_id, 53 void UpdateSession(const std::string& session_id,
55 const uint8* response, 54 const std::vector<uint8_t>& response,
56 int response_length,
57 scoped_ptr<media::SimpleCdmPromise> promise) override; 55 scoped_ptr<media::SimpleCdmPromise> promise) override;
58 void CloseSession(const std::string& session_id, 56 void CloseSession(const std::string& session_id,
59 scoped_ptr<media::SimpleCdmPromise> promise) override; 57 scoped_ptr<media::SimpleCdmPromise> promise) override;
60 void RemoveSession(const std::string& session_id, 58 void RemoveSession(const std::string& session_id,
61 scoped_ptr<media::SimpleCdmPromise> promise) override; 59 scoped_ptr<media::SimpleCdmPromise> promise) override;
62 media::CdmContext* GetCdmContext() override; 60 media::CdmContext* GetCdmContext() override;
63 61
64 // media::CdmContext implementation. 62 // media::CdmContext implementation.
65 media::Decryptor* GetDecryptor() override; 63 media::Decryptor* GetDecryptor() override;
66 int GetCdmId() const override; 64 int GetCdmId() const override;
67 65
68 // Callbacks. 66 // Callbacks.
69 void OnSessionMessage(const std::string& session_id, 67 void OnSessionMessage(const std::string& session_id,
70 media::MediaKeys::MessageType message_type, 68 media::MediaKeys::MessageType message_type,
71 const std::vector<uint8>& message, 69 const std::vector<uint8_t>& message,
72 const GURL& legacy_destination_url); 70 const GURL& legacy_destination_url);
73 void OnSessionClosed(const std::string& session_id); 71 void OnSessionClosed(const std::string& session_id);
74 void OnLegacySessionError(const std::string& session_id, 72 void OnLegacySessionError(const std::string& session_id,
75 media::MediaKeys::Exception exception, 73 media::MediaKeys::Exception exception,
76 uint32 system_code, 74 uint32_t system_code,
77 const std::string& error_message); 75 const std::string& error_message);
78 void OnSessionKeysChange(const std::string& session_id, 76 void OnSessionKeysChange(const std::string& session_id,
79 bool has_additional_usable_key, 77 bool has_additional_usable_key,
80 media::CdmKeysInfo keys_info); 78 media::CdmKeysInfo keys_info);
81 void OnSessionExpirationUpdate(const std::string& session_id, 79 void OnSessionExpirationUpdate(const std::string& session_id,
82 const base::Time& new_expiry_time); 80 const base::Time& new_expiry_time);
83 81
84 void OnPromiseResolved(uint32_t promise_id); 82 void OnPromiseResolved(uint32_t promise_id);
85 void OnPromiseResolvedWithSession(uint32_t promise_id, 83 void OnPromiseResolvedWithSession(uint32_t promise_id,
86 const std::string& session_id); 84 const std::string& session_id);
(...skipping 24 matching lines...) Expand all
111 media::SessionExpirationUpdateCB session_expiration_update_cb_; 109 media::SessionExpirationUpdateCB session_expiration_update_cb_;
112 110
113 media::CdmPromiseAdapter cdm_promise_adapter_; 111 media::CdmPromiseAdapter cdm_promise_adapter_;
114 112
115 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); 113 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
116 }; 114 };
117 115
118 } // namespace content 116 } // namespace content
119 117
120 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 118 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | content/renderer/media/crypto/proxy_media_keys.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698