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

Side by Side Diff: content/browser/media/android/browser_media_player_manager.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_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 const std::string& web_session_id) OVERRIDE; 99 const std::string& web_session_id) OVERRIDE;
100 virtual void OnSessionMessage(int cdm_id, 100 virtual void OnSessionMessage(int cdm_id,
101 uint32 session_id, 101 uint32 session_id,
102 const std::vector<uint8>& message, 102 const std::vector<uint8>& message,
103 const GURL& destination_url) OVERRIDE; 103 const GURL& destination_url) OVERRIDE;
104 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE; 104 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE;
105 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE; 105 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE;
106 virtual void OnSessionError(int cdm_id, 106 virtual void OnSessionError(int cdm_id,
107 uint32 session_id, 107 uint32 session_id,
108 media::MediaKeys::KeyError error_code, 108 media::MediaKeys::KeyError error_code,
109 int system_code) OVERRIDE; 109 uint32 system_code) OVERRIDE;
110 110
111 #if defined(VIDEO_HOLE) 111 #if defined(VIDEO_HOLE)
112 void AttachExternalVideoSurface(int player_id, jobject surface); 112 void AttachExternalVideoSurface(int player_id, jobject surface);
113 void DetachExternalVideoSurface(int player_id); 113 void DetachExternalVideoSurface(int player_id);
114 #endif // defined(VIDEO_HOLE) 114 #endif // defined(VIDEO_HOLE)
115 115
116 // Called to disble the current fullscreen playback if the video is encrypted. 116 // Called to disble the current fullscreen playback if the video is encrypted.
117 // TODO(qinmin): remove this once we have the new fullscreen mode. 117 // TODO(qinmin): remove this once we have the new fullscreen mode.
118 void DisableFullscreenEncryptedMediaPlayback(); 118 void DisableFullscreenEncryptedMediaPlayback();
119 119
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; 243 scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
244 244
245 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 245 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
246 246
247 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 247 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
248 }; 248 };
249 249
250 } // namespace content 250 } // namespace content
251 251
252 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 252 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698