Commit c2ff5667 authored by dpolukhin's avatar dpolukhin Committed by Commit bot

Make PNaCl component downloadable for chromeos-chrome built for Linux

Chrome4ChromeOS for Linux packages needs pNaCl but it is not part of package
so make it downloadable when running on Linux. In Chrome OS PNaCl is part of
rootfs.

BUG=422121
TEST=manual

Review URL: https://codereview.chromium.org/662713006

Cr-Commit-Position: refs/heads/master@{#300236}
parent 005f390e
...@@ -402,9 +402,16 @@ void RegisterComponentsForUpdate() { ...@@ -402,9 +402,16 @@ void RegisterComponentsForUpdate() {
RegisterPepperFlashComponent(cus); RegisterPepperFlashComponent(cus);
RegisterSwiftShaderComponent(cus); RegisterSwiftShaderComponent(cus);
RegisterWidevineCdmComponent(cus); RegisterWidevineCdmComponent(cus);
#if !defined(DISABLE_NACL)
g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
#endif #endif
#if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
#if defined(OS_CHROMEOS)
// PNaCl on Chrome OS is on rootfs and there is no need to download it. But
// Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component
// installer when ruining on Linux. See crbug.com/422121 for more details.
if (!base::SysInfo::IsRunningOnChromeOS())
#endif
g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
#endif #endif
if (translate::CldDataSource::ShouldRegisterForComponentUpdates()) { if (translate::CldDataSource::ShouldRegisterForComponentUpdates()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment