Commit 934d7b1d authored by Jonah Ryan-Davis's avatar Jonah Ryan-Davis Committed by Commit Bot

Fix accidental launch of passthrough on OS_CHROMEOS

Because OS_LINUX includes OS_CHROMEOS, passthrough was accidentally
launched on ChromeOS by default. This was eventually refactored to
explicitly include OS_CHROMEOS, but we want to exclude that.

Bug: chromium:976283
Bug: chromium:1095700
Change-Id: I61f83056f91a174352cdddabce1d35b70ee3728a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419541Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
Cr-Commit-Position: refs/heads/master@{#808631}
parent b2793c47
...@@ -13,8 +13,7 @@ namespace features { ...@@ -13,8 +13,7 @@ namespace features {
// Launched on Windows, still experimental on other platforms. // Launched on Windows, still experimental on other platforms.
const base::Feature kDefaultPassthroughCommandDecoder{ const base::Feature kDefaultPassthroughCommandDecoder{
"DefaultPassthroughCommandDecoder", "DefaultPassthroughCommandDecoder",
#if defined(OS_WIN) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
!defined(CHROMECAST_BUILD))
base::FEATURE_ENABLED_BY_DEFAULT base::FEATURE_ENABLED_BY_DEFAULT
#else #else
base::FEATURE_DISABLED_BY_DEFAULT base::FEATURE_DISABLED_BY_DEFAULT
......
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