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

Side by Side Diff: media/base/android/media_drm_bridge.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
« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // Call this function right after Create() and before any other calls. 79 // Call this function right after Create() and before any other calls.
80 // Note: 80 // Note:
81 // - If this function is not called, the default security level of the device 81 // - If this function is not called, the default security level of the device
82 // will be used. 82 // will be used.
83 // - It's recommended to call this function only once on a MediaDrmBridge 83 // - It's recommended to call this function only once on a MediaDrmBridge
84 // object. Calling this function multiples times may cause errors. 84 // object. Calling this function multiples times may cause errors.
85 bool SetSecurityLevel(SecurityLevel security_level); 85 bool SetSecurityLevel(SecurityLevel security_level);
86 86
87 // MediaKeys (via BrowserCdm) implementation. 87 // MediaKeys (via BrowserCdm) implementation.
88 void SetServerCertificate( 88 void SetServerCertificate(
89 const uint8* certificate_data, 89 const std::vector<uint8_t>& certificate,
90 int certificate_data_length,
91 scoped_ptr<media::SimpleCdmPromise> promise) override; 90 scoped_ptr<media::SimpleCdmPromise> promise) override;
92 void CreateSessionAndGenerateRequest( 91 void CreateSessionAndGenerateRequest(
93 SessionType session_type, 92 SessionType session_type,
94 media::EmeInitDataType init_data_type, 93 media::EmeInitDataType init_data_type,
95 const uint8* init_data, 94 const std::vector<uint8_t>& init_data,
96 int init_data_length,
97 scoped_ptr<media::NewSessionCdmPromise> promise) override; 95 scoped_ptr<media::NewSessionCdmPromise> promise) override;
98 void LoadSession(SessionType session_type, 96 void LoadSession(SessionType session_type,
99 const std::string& session_id, 97 const std::string& session_id,
100 scoped_ptr<media::NewSessionCdmPromise> promise) override; 98 scoped_ptr<media::NewSessionCdmPromise> promise) override;
101 void UpdateSession(const std::string& session_id, 99 void UpdateSession(const std::string& session_id,
102 const uint8* response, 100 const std::vector<uint8_t>& response,
103 int response_length,
104 scoped_ptr<media::SimpleCdmPromise> promise) override; 101 scoped_ptr<media::SimpleCdmPromise> promise) override;
105 void CloseSession(const std::string& session_id, 102 void CloseSession(const std::string& session_id,
106 scoped_ptr<media::SimpleCdmPromise> promise) override; 103 scoped_ptr<media::SimpleCdmPromise> promise) override;
107 void RemoveSession(const std::string& session_id, 104 void RemoveSession(const std::string& session_id,
108 scoped_ptr<media::SimpleCdmPromise> promise) override; 105 scoped_ptr<media::SimpleCdmPromise> promise) override;
109 CdmContext* GetCdmContext() override; 106 CdmContext* GetCdmContext() override;
110 107
111 // PlayerTracker (via BrowserCdm) implementation. 108 // PlayerTracker (via BrowserCdm) implementation.
112 int RegisterPlayer(const base::Closure& new_key_cb, 109 int RegisterPlayer(const base::Closure& new_key_cb,
113 const base::Closure& cdm_unset_cb) override; 110 const base::Closure& cdm_unset_cb) override;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 PlayerTrackerImpl player_tracker_; 208 PlayerTrackerImpl player_tracker_;
212 209
213 CdmPromiseAdapter cdm_promise_adapter_; 210 CdmPromiseAdapter cdm_promise_adapter_;
214 211
215 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 212 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
216 }; 213 };
217 214
218 } // namespace media 215 } // namespace media
219 216
220 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 217 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698