chrome/common/chrome_content_client.cc - Issue 2048523002: Fix base::GetNativeLibraryName() for Mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 correctly, update comment 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

« chrome/browser/load_library_perf_test.cc ('K') | « chrome/browser/load_library_perf_test.cc ('k') | media/cdm/external_clear_key_test_helper.cc » ('j') | media/cdm/external_clear_key_test_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..f9c1a089d7600bd5068215d8c5c8ba8dccd0e3cb 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(kWidevineCdmName));

if (widevine_cdm_file_check == NOT_CHECKED) {

widevine_cdm_file_check =

(base::PathExists(*adapter_path) && base::PathExists(*cdm_path))