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

Unified 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, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/widevine/cdm/widevine_cdm_common.h
diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h
index 144aacb621028ed2251ce6292bf95c0629f12f83..ec68901526757872958c4044afea7f5c98687c00 100644
--- a/third_party/widevine/cdm/widevine_cdm_common.h
+++ b/third_party/widevine/cdm/widevine_cdm_common.h
@@ -26,24 +26,24 @@ const char kWidevineCdmPluginMimeTypeDescription[] =
#endif
// File name of the CDM on different platforms.
-const base::FilePath::CharType kWidevineCdmFileName[] =
+const char kWidevineCdmFileName[] =
#if defined(OS_MACOSX)
- FILE_PATH_LITERAL("widevinecdm.dylib");
+ "widevinecdm.dylib";
#elif defined(OS_WIN)
- FILE_PATH_LITERAL("widevinecdm.dll");
+ "widevinecdm.dll";
#else // OS_LINUX, etc.
- FILE_PATH_LITERAL("libwidevinecdm.so");
+ "libwidevinecdm.so";
#endif
#if defined(ENABLE_PEPPER_CDMS)
// File name of the adapter on different platforms.
-const base::FilePath::CharType kWidevineCdmAdapterFileName[] =
+const char kWidevineCdmAdapterFileName[] =
#if defined(OS_MACOSX)
- FILE_PATH_LITERAL("widevinecdmadapter.plugin");
+ "widevinecdmadapter.plugin";
#elif defined(OS_WIN)
- FILE_PATH_LITERAL("widevinecdmadapter.dll");
+ "widevinecdmadapter.dll";
#else // OS_LINUX, etc.
- FILE_PATH_LITERAL("libwidevinecdmadapter.so");
+ "libwidevinecdmadapter.so";
#endif
#endif // defined(ENABLE_PEPPER_CDMS)
« 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