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

Side by Side Diff: media/base/android/media_player_android.cc

Issue 276973005: BrowserMediaPlayerManager manages MediaKeys objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 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 | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('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 #include "media/base/android/media_player_android.h" 5 #include "media/base/android/media_player_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/android/media_drm_bridge.h"
9 #include "media/base/android/media_player_manager.h" 8 #include "media/base/android/media_player_manager.h"
9 #include "media/base/media_keys.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 MediaPlayerAndroid::MediaPlayerAndroid( 13 MediaPlayerAndroid::MediaPlayerAndroid(
14 int player_id, 14 int player_id,
15 MediaPlayerManager* manager, 15 MediaPlayerManager* manager,
16 const RequestMediaResourcesCB& request_media_resources_cb, 16 const RequestMediaResourcesCB& request_media_resources_cb,
17 const ReleaseMediaResourcesCB& release_media_resources_cb) 17 const ReleaseMediaResourcesCB& release_media_resources_cb)
18 : request_media_resources_cb_(request_media_resources_cb), 18 : request_media_resources_cb_(request_media_resources_cb),
19 release_media_resources_cb_(release_media_resources_cb), 19 release_media_resources_cb_(release_media_resources_cb),
20 player_id_(player_id), 20 player_id_(player_id),
21 manager_(manager) { 21 manager_(manager) {
22 } 22 }
23 23
24 MediaPlayerAndroid::~MediaPlayerAndroid() {} 24 MediaPlayerAndroid::~MediaPlayerAndroid() {}
25 25
26 GURL MediaPlayerAndroid::GetUrl() { 26 GURL MediaPlayerAndroid::GetUrl() {
27 return GURL(); 27 return GURL();
28 } 28 }
29 29
30 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { 30 GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
31 return GURL(); 31 return GURL();
32 } 32 }
33 33
34 void MediaPlayerAndroid::SetDrmBridge(MediaDrmBridge* drm_bridge) { 34 void MediaPlayerAndroid::SetCdm(MediaKeys* cdm) {
35 // Not all players support DrmBridge. Do nothing by default. 35 // Not all players support CDMs. Do nothing by default.
36 return; 36 return;
37 } 37 }
38 38
39 void MediaPlayerAndroid::OnKeyAdded() { 39 void MediaPlayerAndroid::OnKeyAdded() {
40 // Not all players care about the decryption key. Do nothing by default. 40 // Not all players care about the decryption key. Do nothing by default.
41 return; 41 return;
42 } 42 }
43 43
44 } // namespace media 44 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698