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

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

Issue 100543005: Update all users of base::Version to explicitly specify the namespace, and clean up the header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: someday it will work Created 6 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/product_unittest.cc ('k') | chrome/test/gpu/gpu_feature_browsertest.cc » ('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 "chrome/renderer/media/chrome_key_systems.h" 5 #include "chrome/renderer/media/chrome_key_systems.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 kCdmSupportedCodecsValueDelimiter, 242 kCdmSupportedCodecsValueDelimiter,
243 codecs); 243 codecs);
244 break; 244 break;
245 } 245 }
246 } 246 }
247 } 247 }
248 248
249 static void AddPepperBasedWidevine( 249 static void AddPepperBasedWidevine(
250 std::vector<KeySystemInfo>* concrete_key_systems) { 250 std::vector<KeySystemInfo>* concrete_key_systems) {
251 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) 251 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
252 Version glibc_version(gnu_get_libc_version()); 252 base::Version glibc_version(gnu_get_libc_version());
253 DCHECK(glibc_version.IsValid()); 253 DCHECK(glibc_version.IsValid());
254 if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION)) 254 if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION))
255 return; 255 return;
256 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) 256 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
257 257
258 std::vector<base::string16> additional_param_names; 258 std::vector<base::string16> additional_param_names;
259 std::vector<base::string16> additional_param_values; 259 std::vector<base::string16> additional_param_values;
260 if (!IsPepperCdmRegistered(kWidevineCdmPluginMimeType, 260 if (!IsPepperCdmRegistered(kWidevineCdmPluginMimeType,
261 &additional_param_names, 261 &additional_param_names,
262 &additional_param_values)) { 262 &additional_param_values)) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 #endif 324 #endif
325 325
326 #if defined(WIDEVINE_CDM_AVAILABLE) 326 #if defined(WIDEVINE_CDM_AVAILABLE)
327 #if defined(ENABLE_PEPPER_CDMS) 327 #if defined(ENABLE_PEPPER_CDMS)
328 AddPepperBasedWidevine(key_systems_info); 328 AddPepperBasedWidevine(key_systems_info);
329 #elif defined(OS_ANDROID) 329 #elif defined(OS_ANDROID)
330 AddAndroidWidevine(key_systems_info); 330 AddAndroidWidevine(key_systems_info);
331 #endif 331 #endif
332 #endif 332 #endif
333 } 333 }
OLDNEW
« no previous file with comments | « chrome/installer/util/product_unittest.cc ('k') | chrome/test/gpu/gpu_feature_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698