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

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

Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/base/key_systems.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 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/key_system_properties.h" 5 #include "media/base/key_system_properties.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ppapi/features/features.h"
9 8
10 namespace media { 9 namespace media {
11 10
12 SupportedCodecs KeySystemProperties::GetSupportedSecureCodecs() const { 11 SupportedCodecs KeySystemProperties::GetSupportedSecureCodecs() const {
13 #if !defined(OS_ANDROID) 12 #if !defined(OS_ANDROID)
14 NOTREACHED(); 13 NOTREACHED();
15 #endif 14 #endif
16 return EME_CODEC_NONE; 15 return EME_CODEC_NONE;
17 } 16 }
18 17
19 bool KeySystemProperties::UseAesDecryptor() const { 18 bool KeySystemProperties::UseAesDecryptor() const {
20 return false; 19 return false;
21 } 20 }
22 21
23 std::string KeySystemProperties::GetPepperType() const { 22 std::string KeySystemProperties::GetPepperType() const {
24 #if !BUILDFLAG(ENABLE_PEPPER_CDMS) 23 #if !defined(ENABLE_PEPPER_CDMS)
25 NOTREACHED(); 24 NOTREACHED();
26 #endif 25 #endif
27 return ""; 26 return "";
28 } 27 }
29 28
30 } // namespace media 29 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/base/key_systems.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698