diff options
| author | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 07:13:58 +0000 |
|---|---|---|
| committer | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 07:13:58 +0000 |
| commit | 244722b1cbc6adbc2d662fbb9ff06c92d350241c (patch) | |
| tree | c746b6d1ed26e7779c04c770fd41b2a7b0ac2c73 /android_webview | |
| parent | 3304602a91e4c6603e8e98e1a04908365e795a02 (diff) | |
| download | chromium_src-244722b1cbc6adbc2d662fbb9ff06c92d350241c.zip chromium_src-244722b1cbc6adbc2d662fbb9ff06c92d350241c.tar.gz chromium_src-244722b1cbc6adbc2d662fbb9ff06c92d350241c.tar.bz2 | |
Add an IPC to return the platform supported key-system names in Android.
- Split widevine_key_systems.(cc|h) into andorid_key_systems.* and
widevine_key_system.*.
- Add a method MediaDrmBridge::GetPlatformKeySystemNames().
BUG=322395
Review URL: https://codereview.chromium.org/320383005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/renderer/aw_key_systems.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc index fb17c01..2076c92 100644 --- a/android_webview/renderer/aw_key_systems.cc +++ b/android_webview/renderer/aw_key_systems.cc @@ -3,13 +3,14 @@ // found in the LICENSE file. #include "android_webview/renderer/aw_key_systems.h" -#include "components/cdm/renderer/widevine_key_systems.h" +#include "components/cdm/renderer/android_key_systems.h" namespace android_webview { void AwAddKeySystems( std::vector<content::KeySystemInfo>* key_systems_info) { cdm::AddAndroidWidevine(key_systems_info); + cdm::AddAndroidPlatformKeySystems(key_systems_info); } } // namespace android_webview |