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

Side by Side Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 2301203002: Disallow non-namespaced use of base::Version. (Closed)
Patch Set: Corrected another instance of non-namespaced base::Version. Created 4 years, 3 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 | « chrome/browser/policy/policy_browsertest.cc ('k') | no next file » | 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 "chrome/renderer/media/chrome_key_systems.h" 5 #include "chrome/renderer/media/chrome_key_systems.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 codecs_string, std::string(1, kCdmSupportedCodecsValueDelimiter), 206 codecs_string, std::string(1, kCdmSupportedCodecsValueDelimiter),
207 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); 207 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
208 break; 208 break;
209 } 209 }
210 } 210 }
211 } 211 }
212 212
213 static void AddPepperBasedWidevine( 213 static void AddPepperBasedWidevine(
214 std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) { 214 std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) {
215 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) 215 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
216 Version glibc_version(gnu_get_libc_version()); 216 base::Version glibc_version(gnu_get_libc_version());
217 DCHECK(glibc_version.IsValid()); 217 DCHECK(glibc_version.IsValid());
218 if (glibc_version < base::Version(WIDEVINE_CDM_MIN_GLIBC_VERSION)) 218 if (glibc_version < base::Version(WIDEVINE_CDM_MIN_GLIBC_VERSION))
219 return; 219 return;
220 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) 220 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
221 221
222 std::vector<base::string16> additional_param_names; 222 std::vector<base::string16> additional_param_names;
223 std::vector<base::string16> additional_param_values; 223 std::vector<base::string16> additional_param_values;
224 if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType, 224 if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType,
225 &additional_param_names, 225 &additional_param_names,
226 &additional_param_values)) { 226 &additional_param_values)) {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 #if defined(WIDEVINE_CDM_AVAILABLE) 290 #if defined(WIDEVINE_CDM_AVAILABLE)
291 AddPepperBasedWidevine(key_systems_properties); 291 AddPepperBasedWidevine(key_systems_properties);
292 #endif // defined(WIDEVINE_CDM_AVAILABLE) 292 #endif // defined(WIDEVINE_CDM_AVAILABLE)
293 293
294 #endif // defined(ENABLE_PEPPER_CDMS) 294 #endif // defined(ENABLE_PEPPER_CDMS)
295 295
296 #if defined(OS_ANDROID) 296 #if defined(OS_ANDROID)
297 cdm::AddAndroidWidevine(key_systems_properties); 297 cdm::AddAndroidWidevine(key_systems_properties);
298 #endif // defined(OS_ANDROID) 298 #endif // defined(OS_ANDROID)
299 } 299 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698