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

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

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated tests 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_RENDERER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Requests an external surface for out-of-band compositing. 84 // Requests an external surface for out-of-band compositing.
85 void RequestExternalSurface(int player_id, const gfx::RectF& geometry); 85 void RequestExternalSurface(int player_id, const gfx::RectF& geometry);
86 86
87 // RenderViewObserver overrides. 87 // RenderViewObserver overrides.
88 virtual void DidCommitCompositorFrame() OVERRIDE; 88 virtual void DidCommitCompositorFrame() OVERRIDE;
89 #endif // defined(VIDEO_HOLE) 89 #endif // defined(VIDEO_HOLE)
90 90
91 // Encrypted media related methods. 91 // Encrypted media related methods.
92 void InitializeCdm(int cdm_id, 92 void InitializeCdm(int cdm_id,
93 ProxyMediaKeys* media_keys, 93 ProxyMediaKeys* media_keys,
94 const std::vector<uint8>& uuid, 94 const std::string& key_system,
95 const GURL& frame_url); 95 const GURL& frame_url);
96 void CreateSession(int cdm_id, 96 void CreateSession(int cdm_id,
97 uint32 session_id, 97 uint32 session_id,
98 CdmHostMsg_CreateSession_ContentType conent_type, 98 CdmHostMsg_CreateSession_ContentType conent_type,
99 const std::vector<uint8>& init_data); 99 const std::vector<uint8>& init_data);
100 void UpdateSession(int cdm_id, 100 void UpdateSession(int cdm_id,
101 uint32 session_id, 101 uint32 session_id,
102 const std::vector<uint8>& response); 102 const std::vector<uint8>& response);
103 void ReleaseSession(int cdm_id, uint32 session_id); 103 void ReleaseSession(int cdm_id, uint32 session_id);
104 void DestroyCdm(int cdm_id); 104 void DestroyCdm(int cdm_id);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 192
193 // WebFrame of pending fullscreen request. 193 // WebFrame of pending fullscreen request.
194 blink::WebFrame* pending_fullscreen_frame_; 194 blink::WebFrame* pending_fullscreen_frame_;
195 195
196 DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager); 196 DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
197 }; 197 };
198 198
199 } // namespace content 199 } // namespace content
200 200
201 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_ 201 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698