bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-04-25 16:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't create Widevine-related folders when Widevine support is disabled (issue #1713)

Browse Source
This commit is contained in:
Marshall Greenblatt 2015-09-24 11:34:51 +03:00
parent 74dfd9ad81
commit a33720558e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/common/main_delegate.cc
View File

@ -535,16 +535,19 @@ void CefMainDelegate::PreSandboxStartup() {
true); // Create if necessary. true); // Create if necessary.
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
const base::FilePath& widevine_plugin_path = GetResourcesFilePath(); const base::FilePath& widevine_plugin_path =
GetResourcesFilePath().AppendASCII(kWidevineCdmAdapterFileName);
if (base::PathExists(widevine_plugin_path)) {
PathService::Override(chrome::FILE_WIDEVINE_CDM_ADAPTER, PathService::Override(chrome::FILE_WIDEVINE_CDM_ADAPTER,
widevine_plugin_path.AppendASCII( widevine_plugin_path);
kWidevineCdmAdapterFileName)); }
#if defined(WIDEVINE_CDM_IS_COMPONENT) #if defined(WIDEVINE_CDM_IS_COMPONENT)
if (command_line->HasSwitch(switches::kEnableWidevineCdm)) {
PathService::Override(chrome::DIR_COMPONENT_WIDEVINE_CDM, PathService::Override(chrome::DIR_COMPONENT_WIDEVINE_CDM,
user_data_path.Append(kWidevineCdmBaseDirectory)); user_data_path.Append(kWidevineCdmBaseDirectory));
}
#endif // defined(WIDEVINE_CDM_IS_COMPONENT) #endif // defined(WIDEVINE_CDM_IS_COMPONENT)
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
} }
if (command_line->HasSwitch(switches::kDisablePackLoading)) if (command_line->HasSwitch(switches::kDisablePackLoading))