| commit | 0d73ca3d802abb2f3af6eeaa0e830fa7a4c6b0ad | [log] [tgz] |
|---|---|---|
| author | Sean McAllister <[email protected]> | Wed Aug 19 17:54:37 2020 |
| committer | Commit Bot <[email protected]> | Wed Aug 19 17:54:37 2020 |
| tree | 36acca7d6df13b9983c78c4b46643b348bd37ede | |
| parent | 40d42134a1f03a07024ec7dd760a341fbfc86e36 [diff] [blame] |
Refactor OS_LINUX preprocessor directive for LaCrOS effort. Currently, ChromeOS defines the OS_LINUX directive as well as OS_CHROMEOS. We're working to separate these two, so we're making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS explicit. Bug: 1110266 Change-Id: Iebbe654853bebeb4af49c9cb793dae5938416f3f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2351374 Commit-Queue: Sean McAllister <[email protected]> Reviewed-by: Drew Wilson <[email protected]> Reviewed-by: Erik Chen <[email protected]> Reviewed-by: Brandon Jones <[email protected]> Reviewed-by: Becca Hughes <[email protected]> Reviewed-by: Dale Curtis <[email protected]> Reviewed-by: Mike Wittman <[email protected]> Reviewed-by: David Roger <[email protected]> Reviewed-by: Dirk Pranke <[email protected]> Reviewed-by: Avi Drissman <[email protected]> Cr-Commit-Position: refs/heads/master@{#799710}
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index 79a64fc..d09ffe6 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -4425,13 +4425,15 @@ #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + defined(OS_CHROMEOS) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = "If enabled, Chrome will scroll web pages on stylus drag."; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || + // defined(OS_CHROMEOS) #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS)