diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-04 04:28:13 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-04 04:28:13 +0000 |
| commit | d198186f8038fb81ec78a01515fd6922d2b1e2ce (patch) | |
| tree | 2d147b39cd3b1dd611dfe03ea703ad0eadd12e4c /third_party/widevine | |
| parent | 0691f4d23f0da28b3c7cb4a449562f7d2a596509 (diff) | |
| download | chromium_src-d198186f8038fb81ec78a01515fd6922d2b1e2ce.zip chromium_src-d198186f8038fb81ec78a01515fd6922d2b1e2ce.tar.gz chromium_src-d198186f8038fb81ec78a01515fd6922d2b1e2ce.tar.bz2 | |
Copy both Widevine CDM and the adapter during component update.
BUG=180260
R=brettw@chromium.org, cpu@chromium.org, ddorwin@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/14800002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/widevine')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm_common.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h index 4c21b25..82ce0c6 100644 --- a/third_party/widevine/cdm/widevine_cdm_common.h +++ b/third_party/widevine/cdm/widevine_cdm_common.h @@ -15,16 +15,26 @@ const int kWidevineCdmVersionNumComponents = 4; // "alpha" is a temporary name until a convention is defined. const char kWidevineKeySystem[] = "com.widevine.alpha"; -const char kWidevineCdmPluginName[] = "Widevine Content Decryption Module"; +const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module"; // Will be parsed as HTML. -const char kWidevineCdmPluginDescription[] = +const char kWidevineCdmDescription[] = "Enables Widevine licenses for playback of HTML audio/video content."; const char kWidevineCdmPluginMimeType[] ="application/x-ppapi-widevine-cdm"; const char kWidevineCdmPluginMimeTypeDescription[] = "Widevine Content Decryption Module"; -// File name of the plugin on different platforms. -const base::FilePath::CharType kWidevineCdmPluginFileName[] = +// File name of the CDM on different platforms. +const base::FilePath::CharType kWidevineCdmFileName[] = +#if defined(OS_MACOSX) + FILE_PATH_LITERAL("widevinecdm.dylib"); +#elif defined(OS_WIN) + FILE_PATH_LITERAL("widevinecdm.dll"); +#else // OS_LINUX, etc. + FILE_PATH_LITERAL("libwidevinecdm.so"); +#endif + +// File name of the adapter on different platforms. +const base::FilePath::CharType kWidevineCdmAdapterFileName[] = #if defined(OS_MACOSX) FILE_PATH_LITERAL("widevinecdmadapter.plugin"); #elif defined(OS_WIN) |