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

Side by Side Diff: components/cdm/renderer/widevine_key_system_properties.cc

Issue 2411433002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fixes 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"
7 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 8 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
8 9
9 #if defined(WIDEVINE_CDM_AVAILABLE) 10 #if defined(WIDEVINE_CDM_AVAILABLE)
10 11
11 using media::EmeConfigRule; 12 using media::EmeConfigRule;
12 using media::EmeFeatureSupport; 13 using media::EmeFeatureSupport;
13 using media::EmeInitDataType; 14 using media::EmeInitDataType;
14 using media::EmeMediaType; 15 using media::EmeMediaType;
15 using media::EmeSessionTypeSupport; 16 using media::EmeSessionTypeSupport;
16 using media::SupportedCodecs; 17 using media::SupportedCodecs;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 EmeFeatureSupport WidevineKeySystemProperties::GetPersistentStateSupport() 159 EmeFeatureSupport WidevineKeySystemProperties::GetPersistentStateSupport()
159 const { 160 const {
160 return persistent_state_support_; 161 return persistent_state_support_;
161 } 162 }
162 163
163 EmeFeatureSupport WidevineKeySystemProperties::GetDistinctiveIdentifierSupport() 164 EmeFeatureSupport WidevineKeySystemProperties::GetDistinctiveIdentifierSupport()
164 const { 165 const {
165 return distinctive_identifier_support_; 166 return distinctive_identifier_support_;
166 } 167 }
167 168
168 #if defined(ENABLE_PEPPER_CDMS) 169 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
169 std::string WidevineKeySystemProperties::GetPepperType() const { 170 std::string WidevineKeySystemProperties::GetPepperType() const {
170 return kWidevineCdmPluginMimeType; 171 return kWidevineCdmPluginMimeType;
171 } 172 }
172 #endif 173 #endif
173 174
174 } // namespace cdm 175 } // namespace cdm
175 176
176 #endif // WIDEVINE_CDM_AVAILABLE 177 #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