Chromium Code Reviews| 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" |
| 11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
| 12 #include "base/strings/string_split.h" | 12 #include "base/strings/string_split.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "chrome/common/render_messages.h" | 14 #include "chrome/common/render_messages.h" |
| 15 #include "components/cdm/renderer/widevine_key_systems.h" | 15 #include "components/cdm/renderer/widevine_key_systems.h" |
| 16 #include "content/public/renderer/render_thread.h" | 16 #include "content/public/renderer/render_thread.h" |
| 17 | 17 |
| 18 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 18 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
| 19 | 19 |
| 20 #if defined(OS_ANDROID) | |
| 21 #include "components/cdm/renderer/android_key_systems.h" | |
| 22 #endif | |
| 23 | |
|
xhwang
2014/06/11 23:12:28
Can you keep l.18 here?
ycheo (away)
2014/06/12 02:02:45
Done.
| |
| 20 // The following must be after widevine_cdm_version.h. | 24 // The following must be after widevine_cdm_version.h. |
| 21 | 25 |
| 22 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) | 26 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) |
| 23 #include <gnu/libc-version.h> | 27 #include <gnu/libc-version.h> |
| 24 #include "base/version.h" | 28 #include "base/version.h" |
| 25 #endif | 29 #endif |
| 26 | 30 |
| 27 using content::KeySystemInfo; | 31 using content::KeySystemInfo; |
| 28 using content::SupportedCodecs; | 32 using content::SupportedCodecs; |
| 29 | 33 |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 | 182 |
| 179 #if defined(WIDEVINE_CDM_AVAILABLE) | 183 #if defined(WIDEVINE_CDM_AVAILABLE) |
| 180 AddPepperBasedWidevine(key_systems_info); | 184 AddPepperBasedWidevine(key_systems_info); |
| 181 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 185 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
| 182 #endif // defined(ENABLE_PEPPER_CDMS) | 186 #endif // defined(ENABLE_PEPPER_CDMS) |
| 183 | 187 |
| 184 #if defined(OS_ANDROID) | 188 #if defined(OS_ANDROID) |
| 185 cdm::AddAndroidWidevine(key_systems_info); | 189 cdm::AddAndroidWidevine(key_systems_info); |
| 186 #endif // defined(OS_ANDROID) | 190 #endif // defined(OS_ANDROID) |
| 187 } | 191 } |
| OLD | NEW |