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

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

Issue 320383005: Add an IPC to return the platform supported key-system names in Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed xhwang's comments. Created 6 years, 6 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 | « android_webview/renderer/aw_key_systems.cc ('k') | components/cdm.gypi » ('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 #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 #if defined(OS_ANDROID)
19 #include "components/cdm/renderer/android_key_systems.h"
20 #endif
21
18 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 22 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
19 23
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;
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « android_webview/renderer/aw_key_systems.cc ('k') | components/cdm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698