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

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

Issue 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 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 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 codecs_string, std::string(1, kCdmSupportedCodecsValueDelimiter), 141 codecs_string, std::string(1, kCdmSupportedCodecsValueDelimiter),
142 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); 142 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
143 break; 143 break;
144 } 144 }
145 } 145 }
146 } 146 }
147 147
148 static void AddPepperBasedWidevine( 148 static void AddPepperBasedWidevine(
149 std::vector<KeySystemInfo>* concrete_key_systems) { 149 std::vector<KeySystemInfo>* concrete_key_systems) {
150 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) 150 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
151 base::Version glibc_version(gnu_get_libc_version()); 151 Version glibc_version(gnu_get_libc_version());
152 DCHECK(glibc_version.IsValid()); 152 DCHECK(glibc_version.IsValid());
153 if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION)) 153 if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION))
154 return; 154 return;
155 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) 155 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
156 156
157 std::vector<base::string16> additional_param_names; 157 std::vector<base::string16> additional_param_names;
158 std::vector<base::string16> additional_param_values; 158 std::vector<base::string16> additional_param_values;
159 if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType, 159 if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType,
160 &additional_param_names, 160 &additional_param_names,
161 &additional_param_values)) { 161 &additional_param_values)) {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 #if defined(WIDEVINE_CDM_AVAILABLE) 222 #if defined(WIDEVINE_CDM_AVAILABLE)
223 AddPepperBasedWidevine(key_systems_info); 223 AddPepperBasedWidevine(key_systems_info);
224 #endif // defined(WIDEVINE_CDM_AVAILABLE) 224 #endif // defined(WIDEVINE_CDM_AVAILABLE)
225 #endif // defined(ENABLE_PEPPER_CDMS) 225 #endif // defined(ENABLE_PEPPER_CDMS)
226 226
227 #if defined(OS_ANDROID) 227 #if defined(OS_ANDROID)
228 cdm::AddAndroidWidevine(key_systems_info); 228 cdm::AddAndroidWidevine(key_systems_info);
229 #endif // defined(OS_ANDROID) 229 #endif // defined(OS_ANDROID)
230 } 230 }
OLDNEW
« no previous file with comments | « chrome/installer/util/product_unittest.cc ('k') | components/component_updater/component_updater_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698