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

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

Issue 2409423002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fix and format 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"
8 9
9 namespace media { 10 namespace media {
10 11
11 SupportedCodecs KeySystemProperties::GetSupportedSecureCodecs() const { 12 SupportedCodecs KeySystemProperties::GetSupportedSecureCodecs() const {
12 #if !defined(OS_ANDROID) 13 #if !defined(OS_ANDROID)
13 NOTREACHED(); 14 NOTREACHED();
14 #endif 15 #endif
15 return EME_CODEC_NONE; 16 return EME_CODEC_NONE;
16 } 17 }
17 18
18 bool KeySystemProperties::UseAesDecryptor() const { 19 bool KeySystemProperties::UseAesDecryptor() const {
19 return false; 20 return false;
20 } 21 }
21 22
22 std::string KeySystemProperties::GetPepperType() const { 23 std::string KeySystemProperties::GetPepperType() const {
23 #if !defined(ENABLE_PEPPER_CDMS) 24 #if !BUILDFLAG(ENABLE_PEPPER_CDMS)
24 NOTREACHED(); 25 NOTREACHED();
25 #endif 26 #endif
26 return ""; 27 return "";
27 } 28 }
28 29
29 } // namespace media 30 } // 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