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

Side by Side Diff: content/renderer/media/android/proxy_media_keys.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_PROXY_MEDIA_KEYS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "media/base/media_keys.h" 9 #include "media/base/media_keys.h"
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // Callbacks. 46 // Callbacks.
47 void OnSessionCreated(uint32 session_id, const std::string& web_session_id); 47 void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
48 void OnSessionMessage(uint32 session_id, 48 void OnSessionMessage(uint32 session_id,
49 const std::vector<uint8>& message, 49 const std::vector<uint8>& message,
50 const std::string& destination_url); 50 const std::string& destination_url);
51 void OnSessionReady(uint32 session_id); 51 void OnSessionReady(uint32 session_id);
52 void OnSessionClosed(uint32 session_id); 52 void OnSessionClosed(uint32 session_id);
53 void OnSessionError(uint32 session_id, 53 void OnSessionError(uint32 session_id,
54 media::MediaKeys::KeyError error_code, 54 media::MediaKeys::KeyError error_code,
55 int system_code); 55 uint32 system_code);
56 56
57 private: 57 private:
58 RendererMediaPlayerManager* manager_; 58 RendererMediaPlayerManager* manager_;
59 int cdm_id_; 59 int cdm_id_;
60 media::SessionCreatedCB session_created_cb_; 60 media::SessionCreatedCB session_created_cb_;
61 media::SessionMessageCB session_message_cb_; 61 media::SessionMessageCB session_message_cb_;
62 media::SessionReadyCB session_ready_cb_; 62 media::SessionReadyCB session_ready_cb_;
63 media::SessionClosedCB session_closed_cb_; 63 media::SessionClosedCB session_closed_cb_;
64 media::SessionErrorCB session_error_cb_; 64 media::SessionErrorCB session_error_cb_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); 66 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
67 }; 67 };
68 68
69 } // namespace content 69 } // namespace content
70 70
71 #endif // CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_ 71 #endif // CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698