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

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

Issue 1427183002: Move MediaDrmBridge provision communication to native side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: For on-demand provisioning the fetcher is created in content/ and depends on the renderer. Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_client_android.h" 5 #include "media/base/android/media_client_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 9
10 #include "media/base/provision_fetcher.h"
11
10 namespace media { 12 namespace media {
11 13
12 static MediaClientAndroid* g_media_client = nullptr; 14 static MediaClientAndroid* g_media_client = nullptr;
13 15
14 void SetMediaClientAndroid(MediaClientAndroid* media_client) { 16 void SetMediaClientAndroid(MediaClientAndroid* media_client) {
15 DCHECK(!g_media_client); 17 DCHECK(!g_media_client);
16 g_media_client = media_client; 18 g_media_client = media_client;
17 } 19 }
18 20
19 MediaClientAndroid* GetMediaClientAndroid() { 21 MediaClientAndroid* GetMediaClientAndroid() {
20 return g_media_client; 22 return g_media_client;
21 } 23 }
22 24
23 MediaClientAndroid::MediaClientAndroid() { 25 MediaClientAndroid::MediaClientAndroid() {
24 } 26 }
25 27
26 MediaClientAndroid::~MediaClientAndroid() { 28 MediaClientAndroid::~MediaClientAndroid() {
27 } 29 }
28 30
31 scoped_ptr<ProvisionFetcher> MediaClientAndroid::CreateDefaultFetcher() const {
32 return nullptr;
33 }
34
29 void MediaClientAndroid::AddKeySystemUUIDMappings(KeySystemUuidMap* map) { 35 void MediaClientAndroid::AddKeySystemUUIDMappings(KeySystemUuidMap* map) {
30 } 36 }
31 37
32 media::MediaDrmBridgeDelegate* MediaClientAndroid::GetMediaDrmBridgeDelegate( 38 media::MediaDrmBridgeDelegate* MediaClientAndroid::GetMediaDrmBridgeDelegate(
33 const std::vector<uint8_t>& scheme_uuid) { 39 const std::vector<uint8_t>& scheme_uuid) {
34 return nullptr; 40 return nullptr;
35 } 41 }
36 42
37 } // namespace media 43 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698