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

Side by Side Diff: components/cdm/renderer/widevine_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 | « components/cdm/renderer/widevine_key_system_properties.h ('k') | content/browser/BUILD.gn » ('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 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/widevine_key_system_properties.h" 5 #include "components/cdm/renderer/widevine_key_system_properties.h"
6 6
7 #include "ppapi/features/features.h"
8 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 7 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
9 8
10 #if defined(WIDEVINE_CDM_AVAILABLE) 9 #if defined(WIDEVINE_CDM_AVAILABLE)
11 10
12 using media::EmeConfigRule; 11 using media::EmeConfigRule;
13 using media::EmeFeatureSupport; 12 using media::EmeFeatureSupport;
14 using media::EmeInitDataType; 13 using media::EmeInitDataType;
15 using media::EmeMediaType; 14 using media::EmeMediaType;
16 using media::EmeSessionTypeSupport; 15 using media::EmeSessionTypeSupport;
17 using media::SupportedCodecs; 16 using media::SupportedCodecs;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 EmeFeatureSupport WidevineKeySystemProperties::GetPersistentStateSupport() 158 EmeFeatureSupport WidevineKeySystemProperties::GetPersistentStateSupport()
160 const { 159 const {
161 return persistent_state_support_; 160 return persistent_state_support_;
162 } 161 }
163 162
164 EmeFeatureSupport WidevineKeySystemProperties::GetDistinctiveIdentifierSupport() 163 EmeFeatureSupport WidevineKeySystemProperties::GetDistinctiveIdentifierSupport()
165 const { 164 const {
166 return distinctive_identifier_support_; 165 return distinctive_identifier_support_;
167 } 166 }
168 167
169 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 168 #if defined(ENABLE_PEPPER_CDMS)
170 std::string WidevineKeySystemProperties::GetPepperType() const { 169 std::string WidevineKeySystemProperties::GetPepperType() const {
171 return kWidevineCdmPluginMimeType; 170 return kWidevineCdmPluginMimeType;
172 } 171 }
173 #endif 172 #endif
174 173
175 } // namespace cdm 174 } // namespace cdm
176 175
177 #endif // WIDEVINE_CDM_AVAILABLE 176 #endif // WIDEVINE_CDM_AVAILABLE
OLDNEW
« no previous file with comments | « components/cdm/renderer/widevine_key_system_properties.h ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698