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

Side by Side Diff: third_party/widevine/cdm/widevine_cdm_common.h

Issue 15658009: Fix a type mismatch on Windows caused by r201738. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ 5 #ifndef WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
6 #define WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ 6 #define WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 9
10 // This file defines constants common to all Widevine CDM versions. 10 // This file defines constants common to all Widevine CDM versions.
11 11
12 // Widevine CDM version contains 4 components, e.g. 1.4.0.195. 12 // Widevine CDM version contains 4 components, e.g. 1.4.0.195.
13 const int kWidevineCdmVersionNumComponents = 4; 13 const int kWidevineCdmVersionNumComponents = 4;
14 14
15 // "alpha" is a temporary name until a convention is defined. 15 // "alpha" is a temporary name until a convention is defined.
16 const char kWidevineKeySystem[] = "com.widevine.alpha"; 16 const char kWidevineKeySystem[] = "com.widevine.alpha";
17 17
18 const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module"; 18 const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module";
19 // Will be parsed as HTML. 19 // Will be parsed as HTML.
20 const char kWidevineCdmDescription[] = 20 const char kWidevineCdmDescription[] =
21 "Enables Widevine licenses for playback of HTML audio/video content."; 21 "Enables Widevine licenses for playback of HTML audio/video content.";
22 #if defined(ENABLE_PEPPER_CDMS) 22 #if defined(ENABLE_PEPPER_CDMS)
23 const char kWidevineCdmPluginMimeType[] = "application/x-ppapi-widevine-cdm"; 23 const char kWidevineCdmPluginMimeType[] = "application/x-ppapi-widevine-cdm";
24 const char kWidevineCdmPluginMimeTypeDescription[] = 24 const char kWidevineCdmPluginMimeTypeDescription[] =
25 "Widevine Content Decryption Module"; 25 "Widevine Content Decryption Module";
26 #endif 26 #endif
27 27
28 // File name of the CDM on different platforms. 28 // File name of the CDM on different platforms.
29 const base::FilePath::CharType kWidevineCdmFileName[] = 29 const char kWidevineCdmFileName[] =
30 #if defined(OS_MACOSX) 30 #if defined(OS_MACOSX)
31 FILE_PATH_LITERAL("widevinecdm.dylib"); 31 "widevinecdm.dylib";
32 #elif defined(OS_WIN) 32 #elif defined(OS_WIN)
33 FILE_PATH_LITERAL("widevinecdm.dll"); 33 "widevinecdm.dll";
34 #else // OS_LINUX, etc. 34 #else // OS_LINUX, etc.
35 FILE_PATH_LITERAL("libwidevinecdm.so"); 35 "libwidevinecdm.so";
36 #endif 36 #endif
37 37
38 #if defined(ENABLE_PEPPER_CDMS) 38 #if defined(ENABLE_PEPPER_CDMS)
39 // File name of the adapter on different platforms. 39 // File name of the adapter on different platforms.
40 const base::FilePath::CharType kWidevineCdmAdapterFileName[] = 40 const char kWidevineCdmAdapterFileName[] =
41 #if defined(OS_MACOSX) 41 #if defined(OS_MACOSX)
42 FILE_PATH_LITERAL("widevinecdmadapter.plugin"); 42 "widevinecdmadapter.plugin";
43 #elif defined(OS_WIN) 43 #elif defined(OS_WIN)
44 FILE_PATH_LITERAL("widevinecdmadapter.dll"); 44 "widevinecdmadapter.dll";
45 #else // OS_LINUX, etc. 45 #else // OS_LINUX, etc.
46 FILE_PATH_LITERAL("libwidevinecdmadapter.so"); 46 "libwidevinecdmadapter.so";
47 #endif 47 #endif
48 #endif // defined(ENABLE_PEPPER_CDMS) 48 #endif // defined(ENABLE_PEPPER_CDMS)
49 49
50 50
51 #if defined(ENABLE_PEPPER_CDMS) && (defined(OS_MACOSX) || defined(OS_WIN)) 51 #if defined(ENABLE_PEPPER_CDMS) && (defined(OS_MACOSX) || defined(OS_WIN))
52 // CDM is installed by the component installer instead of the Chrome installer. 52 // CDM is installed by the component installer instead of the Chrome installer.
53 #define WIDEVINE_CDM_IS_COMPONENT 53 #define WIDEVINE_CDM_IS_COMPONENT
54 #endif 54 #endif
55 55
56 #endif // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ 56 #endif // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698