| commit | df807711df7791bd53d40825f3a423e0435bcbf2 | [log] [tgz] |
|---|---|---|
| author | Sean McAllister <[email protected]> | Thu Aug 13 23:19:09 2020 |
| committer | Commit Bot <[email protected]> | Thu Aug 13 23:19:09 2020 |
| tree | faf3ece84649da9134723c5bd60a551728b9e7ff | |
| parent | 8ef94b7b09f972bab87b5475493f4f03d486e2fe [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: I5a906f5fd11894d2a618daced64235e8af558cd0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354835 Reviewed-by: Lei Zhang <[email protected]> Commit-Queue: Sean McAllister <[email protected]> Cr-Commit-Position: refs/heads/master@{#797905}
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index 8996948..0acace5 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc
@@ -174,7 +174,8 @@ } #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ + defined(OS_WIN) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif