[Lacros] Use Roboto font

Bug: 1143953
Change-Id: I4febdac138688de659ceaa96a54d0427dec0473d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2581449Reviewed-by: Erik Chen <erikchen@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Darin Fisher <darin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835310}

chrome/browser/ui/views/chrome_typography_provider.cc

@@ -82,7 +82,7 @@ const gfx::FontList& ChromeTypographyProvider::GetFont(int context,
     // Secondary font is for double-digit counts. Because we have control over
     // system fonts on ChromeOS, we can just choose a condensed font. For other
     // platforms we adjust size.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     typeface = "Roboto Condensed";
 #else
     size_delta -= 2;

ui/base/resource/resource_bundle.cc

@@ -55,7 +55,7 @@
 #include "ui/base/resource/resource_bundle_android.h"
 #endif
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "ui/gfx/platform_font_skia.h"
 #endif
 
@@ -970,7 +970,7 @@ void ResourceBundle::AddDataPack(std::unique_ptr<DataPack> data_pack) {
 }
 
 void ResourceBundle::InitDefaultFontList() {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // InitDefaultFontList() is called earlier than overriding the locale strings.
   // So we call the |GetLocalizedStringImpl()| which doesn't set the flag
   // |can_override_locale_string_resources_| to false. This is okay, because the

ui/gfx/platform_font_skia.cc

@@ -172,7 +172,7 @@ bool PlatformFontSkia::InitDefaultFont() {
     delegate->GetDefaultFontDescription(&family, &size_pixels, &style, &weight,
                                         &params);
   } else if (default_font_description_) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     // On ChromeOS, a FontList font description string is stored as a
     // translatable resource and passed in via SetDefaultFontDescription().
     FontRenderParamsQuery query;

ui/strings/app_locale_settings.grd

@@ -217,7 +217,7 @@
           75%
         </message>
       </if>
-      <if expr="(is_linux or is_android or is_bsd) and not chromeos">
+      <if expr="(is_linux or is_android or is_bsd) and not (chromeos or lacros)">
         <!-- The font used in Web UI (e.g. History). Note that these are only
              backups. We try to use the system font if possible. -->
         <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
@@ -230,7 +230,7 @@
         </message>
       </if>
       <!-- For Chrome OS -->
-      <if expr="chromeos">
+      <if expr="chromeos or lacros">
         <!-- The font name like: 'Font Name, 12px' -->
         <message name="IDS_UI_FONT_FAMILY_CROS" use_name_for_id="true">
           Roboto, 12px