chrome/common/chrome_paths.cc - Issue 15028015: Conditionally build support for Pepper-based CDMs.

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 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use AppendAscii() where possible. 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:

Index: chrome/common/chrome_paths.cc

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

index 49a5d7c968023157a8aa82404f52859127d56303..641baf26c50faacd466996055d68022faaf2990b 100644

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

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

@@ -354,7 +354,7 @@ bool PathProvider(int key, base::FilePath* result) {

cur = cur.Append(kGTalkPluginFileName);

break;

#endif

-#if defined(WIDEVINE_CDM_AVAILABLE)

+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)

#if defined(WIDEVINE_CDM_IS_COMPONENT)

case chrome::DIR_COMPONENT_WIDEVINE_CDM:

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

@@ -370,7 +370,7 @@ bool PathProvider(int key, base::FilePath* result) {

return false;

cur = cur.Append(kWidevineCdmAdapterFileName);

break;

-#endif // defined(WIDEVINE_CDM_AVAILABLE)

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

case chrome::FILE_RESOURCES_PACK:

#if defined(OS_MACOSX) && !defined(OS_IOS)

if (base::mac::AmIBundled()) {

« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/renderer/plugins/plugin_uma.cc » ('j') | no next file with comments »