diff options
Diffstat (limited to 'chromium/chrome/common/chrome_paths.h')
| -rw-r--r-- | chromium/chrome/common/chrome_paths.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/chromium/chrome/common/chrome_paths.h b/chromium/chrome/common/chrome_paths.h index e554d78efd6..3f73d868b54 100644 --- a/chromium/chrome/common/chrome_paths.h +++ b/chromium/chrome/common/chrome_paths.h @@ -93,7 +93,17 @@ enum { DIR_PNACL_BASE, // Full path to the base dir for PNaCl. DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version // (subdir of DIR_PNACL_BASE). - FILE_WIDEVINE_CDM, // Full path to the Widevine CDM. +#if defined(OS_LINUX) + DIR_BUNDLED_WIDEVINE_CDM, // Full path to the directory containing the + // bundled Widevine CDM. +#if !defined(OS_CHROMEOS) + DIR_COMPONENT_UPDATED_WIDEVINE_CDM, // Base directory of the Widevine CDM + // downloaded by the component + // updater. + FILE_COMPONENT_WIDEVINE_CDM_HINT, // A file in a known location that points + // to the component updated Widevine CDM. +#endif // !defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) FILE_RESOURCES_PACK, // Full path to the .pak file containing binary data. // This includes data for internal pages (e.g., html // files and images), unless these resources are @@ -108,13 +118,6 @@ enum { // wallpaper thumbnails reside. DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers // reside. - // Managed Crostini deployments. - FILE_CHROMEOS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG, // A file with JSON - // configuration for Ansible - // package management. - DIR_CHROMEOS_CROSTINI_ANSIBLE_PLAYBOOK_STAGING, // Directory where Ansible - // playbooks pending - // execution reside. #endif DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are |