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

Side by Side Diff: media/base/media_keys.cc

Issue 665563002: Add MediaKeys::GetCdmId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Comments & Updated ProxyMediaKeys Created 6 years, 2 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
« media/base/media_keys.h ('K') | « media/base/media_keys.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "media/base/media_keys.h" 5 #include "media/base/media_keys.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 MediaKeys::MediaKeys() {} 9 MediaKeys::MediaKeys() {}
10 10
11 MediaKeys::~MediaKeys() {} 11 MediaKeys::~MediaKeys() {}
12 12
13 Decryptor* MediaKeys::GetDecryptor() { return NULL; } 13 Decryptor* MediaKeys::GetDecryptor() {
14 return NULL;
15 }
16
17 #if defined(ENABLE_BROWSER_CDMS)
18 int MediaKeys::GetCdmId() const {
19 return kInvalidCdmId;
20 }
21 #endif
14 22
15 } // namespace media 23 } // namespace media
OLDNEW
« media/base/media_keys.h ('K') | « media/base/media_keys.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698