OLD | NEW |
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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) { | 218 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) { |
219 #if defined(ENABLE_PEPPER_CDMS) | 219 #if defined(ENABLE_PEPPER_CDMS) |
220 AddExternalClearKey(key_systems_info); | 220 AddExternalClearKey(key_systems_info); |
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 // TODO(sandersd): Non-compositing support depends on the | 228 cdm::AddAndroidWidevine(key_systems_info); |
229 // use_video_overlay_for_embedded_encrypted_video pref, which may differ per | |
230 // WebContents. For now, Chromium does not support them. | |
231 // http://crbug.com/467779 | |
232 cdm::AddAndroidWidevine(key_systems_info, false); | |
233 #endif // defined(OS_ANDROID) | 229 #endif // defined(OS_ANDROID) |
234 } | 230 } |
OLD | NEW |