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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 2048523002: Fix base::GetNativeLibraryName() for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_lib_clean
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/load_library_perf_test.cc ('k') | media/cdm/cdm_paths.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 571d73729fbadfa4ca26481182d17fb1d53e655b..f4414936e8e0e89a3495aec4073693e75ea35484 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -14,6 +14,7 @@
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/memory/scoped_vector.h"
+#include "base/native_library.h"
#include "base/path_service.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
@@ -117,7 +118,8 @@ bool IsWidevineAvailable(base::FilePath* adapter_path,
// TODO(jrummell): We should add a new path for DIR_WIDEVINE_CDM and use that
// to locate the CDM and the CDM adapter.
if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, adapter_path)) {
- *cdm_path = adapter_path->DirName().AppendASCII(kWidevineCdmFileName);
+ *cdm_path = adapter_path->DirName().AppendASCII(
+ base::GetNativeLibraryName(kWidevineCdmLibraryName));
if (widevine_cdm_file_check == NOT_CHECKED) {
widevine_cdm_file_check =
(base::PathExists(*adapter_path) && base::PathExists(*cdm_path))
« no previous file with comments | « chrome/browser/load_library_perf_test.cc ('k') | media/cdm/cdm_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698