chrome/common/chrome_paths.cc - Issue 1978123002: Revert of media: Move widevine CDM targets to WidevineCdm folder

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_paths.cc

Issue 1978123002: Revert of media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

Index: chrome/common/chrome_paths.cc

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc

index 5dfcbcce973d28cb05c26667dcdf3c2e9f00efe8..c7462488e883bde329b393b3701d8040e384813b 100644

--- a/chrome/common/chrome_paths.cc

+++ b/chrome/common/chrome_paths.cc

@@ -345,7 +345,7 @@

case chrome::DIR_COMPONENT_WIDEVINE_CDM:

if (!PathService::Get(chrome::DIR_USER_DATA, &cur))

return false;

- cur = cur.AppendASCII(kWidevineCdmBaseDirectory);

+ cur = cur.Append(FILE_PATH_LITERAL("WidevineCDM"));

break;

#endif // defined(WIDEVINE_CDM_IS_COMPONENT)

// TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.

@@ -354,7 +354,6 @@

case chrome::FILE_WIDEVINE_CDM_ADAPTER:

if (!GetInternalPluginsDirectory(&cur))

return false;

- cur = cur.AppendASCII(kWidevineCdmBaseDirectory);

cur = cur.AppendASCII(kWidevineCdmAdapterFileName);

break;

#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)

« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/installer/linux/BUILD.gn » ('j') | no next file with comments »