Commit 17829a1a authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

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.

This is changes for /content/browser/font_unique_name_lookup

This CL was uploaded by git cl split.

R=drott@chromium.org

Bug: 1110266
Change-Id: I6e746e1ed90bf2bab026c0c159ebd926d7411979
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2371289
Auto-Submit: Sean McAllister <smcallis@google.com>
Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801012}
parent 9a4b29d1
...@@ -65,7 +65,7 @@ const char* kExpectedFontFamilyNames[] = {"AndroidClock", ...@@ -65,7 +65,7 @@ const char* kExpectedFontFamilyNames[] = {"AndroidClock",
"Roboto Condensed", "Roboto Condensed",
"Roboto Condensed", "Roboto Condensed",
"Roboto"}; "Roboto"};
#elif defined(OS_LINUX) #elif defined(OS_LINUX) || defined(OS_CHROMEOS)
const char* kExpectedFontFamilyNames[] = {"Ahem", const char* kExpectedFontFamilyNames[] = {"Ahem",
"Arimo", "Arimo",
"Arimo", "Arimo",
......
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