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

Side by Side Diff: components/cdm/renderer/external_clear_key_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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/cdm/renderer/external_clear_key_key_system_properties.h" 5 #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/eme_constants.h" 8 #include "media/base/eme_constants.h"
9 #include "ppapi/features/features.h"
10 9
11 namespace cdm { 10 namespace cdm {
12 11
13 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 12 #if defined(ENABLE_PEPPER_CDMS)
14 const char kExternalClearKeyPepperType[] = "application/x-ppapi-clearkey-cdm"; 13 const char kExternalClearKeyPepperType[] = "application/x-ppapi-clearkey-cdm";
15 #endif 14 #endif
16 15
17 ExternalClearKeyProperties::ExternalClearKeyProperties( 16 ExternalClearKeyProperties::ExternalClearKeyProperties(
18 const std::string& key_system_name) 17 const std::string& key_system_name)
19 : key_system_name_(key_system_name) {} 18 : key_system_name_(key_system_name) {}
20 19
21 ExternalClearKeyProperties::~ExternalClearKeyProperties() {} 20 ExternalClearKeyProperties::~ExternalClearKeyProperties() {}
22 21
23 std::string ExternalClearKeyProperties::GetKeySystemName() const { 22 std::string ExternalClearKeyProperties::GetKeySystemName() const {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 media::EmeFeatureSupport ExternalClearKeyProperties::GetPersistentStateSupport() 73 media::EmeFeatureSupport ExternalClearKeyProperties::GetPersistentStateSupport()
75 const { 74 const {
76 return media::EmeFeatureSupport::REQUESTABLE; 75 return media::EmeFeatureSupport::REQUESTABLE;
77 } 76 }
78 77
79 media::EmeFeatureSupport 78 media::EmeFeatureSupport
80 ExternalClearKeyProperties::GetDistinctiveIdentifierSupport() const { 79 ExternalClearKeyProperties::GetDistinctiveIdentifierSupport() const {
81 return media::EmeFeatureSupport::NOT_SUPPORTED; 80 return media::EmeFeatureSupport::NOT_SUPPORTED;
82 } 81 }
83 82
84 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 83 #if defined(ENABLE_PEPPER_CDMS)
85 std::string ExternalClearKeyProperties::GetPepperType() const { 84 std::string ExternalClearKeyProperties::GetPepperType() const {
86 return kExternalClearKeyPepperType; 85 return kExternalClearKeyPepperType;
87 } 86 }
88 #endif 87 #endif
89 88
90 } // namespace cdm 89 } // namespace cdm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698