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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 const unsigned char* init_data, 213 const unsigned char* init_data,
214 unsigned init_data_length, 214 unsigned init_data_length,
215 const blink::WebString& session_id); 215 const blink::WebString& session_id);
216 virtual MediaKeyException cancelKeyRequest( 216 virtual MediaKeyException cancelKeyRequest(
217 const blink::WebString& key_system, 217 const blink::WebString& key_system,
218 const blink::WebString& session_id); 218 const blink::WebString& session_id);
219 219
220 void OnKeyAdded(const std::string& session_id); 220 void OnKeyAdded(const std::string& session_id);
221 void OnKeyError(const std::string& session_id, 221 void OnKeyError(const std::string& session_id,
222 media::MediaKeys::KeyError error_code, 222 media::MediaKeys::KeyError error_code,
223 int system_code); 223 uint32 system_code);
224 void OnKeyMessage(const std::string& session_id, 224 void OnKeyMessage(const std::string& session_id,
225 const std::vector<uint8>& message, 225 const std::vector<uint8>& message,
226 const std::string& destination_url); 226 const std::string& destination_url);
227 227
228 void OnMediaSourceOpened(blink::WebMediaSource* web_media_source); 228 void OnMediaSourceOpened(blink::WebMediaSource* web_media_source);
229 229
230 void OnNeedKey(const std::string& type, 230 void OnNeedKey(const std::string& type,
231 const std::vector<uint8>& init_data); 231 const std::vector<uint8>& init_data);
232 232
233 // TODO(xhwang): Implement WebMediaPlayer::setContentDecryptionModule(). 233 // TODO(xhwang): Implement WebMediaPlayer::setContentDecryptionModule().
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 scoped_ptr<ProxyDecryptor> proxy_decryptor_; 444 scoped_ptr<ProxyDecryptor> proxy_decryptor_;
445 445
446 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 446 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
447 447
448 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 448 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
449 }; 449 };
450 450
451 } // namespace content 451 } // namespace content
452 452
453 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 453 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698