Use views::style for buttons, bootstrap ash_typography to do so.

chrome/browser/ui/views/harmony/harmony_typography_provider.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/harmony/harmony_typography_provider.h"
 
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/platform_font.h"
 
+#if defined(USE_ASH)
+#include "ash/public/cpp/ash_typography.h"
+#endif
+
 const gfx::FontList& HarmonyTypographyProvider::GetFont(int text_context,
                                                         int text_style) const {
   // "Target" font size constants from the Harmony spec.
   constexpr int kHeadlineSize = 20;
   constexpr int kTitleSize = 15;
   constexpr int kBodyTextLargeSize = 13;
   constexpr int kDefaultSize = 12;
 
 #if defined(OS_WIN)
   constexpr gfx::Font::Weight kButtonFontWeight = gfx::Font::Weight::BOLD;
 #else
   constexpr gfx::Font::Weight kButtonFontWeight = gfx::Font::Weight::MEDIUM;
 #endif
 
   int size_delta = kDefaultSize - gfx::PlatformFont::kDefaultBaseFontSize;
   gfx::Font::Weight font_weight = gfx::Font::Weight::NORMAL;
+
+#if defined(USE_ASH)
+  ash::ApplyAshFontStyles(text_context, text_style, &size_delta, &font_weight);
+#endif
+
   switch (text_context) {
-    case CONTEXT_HEADLINE:
-      size_delta = kHeadlineSize - gfx::PlatformFont::kDefaultBaseFontSize;
+    case views::style::CONTEXT_BUTTON_MD:
+      font_weight = WeightNotLighterThanNormal(kButtonFontWeight);
       break;
     case views::style::CONTEXT_DIALOG_TITLE:
       size_delta = kTitleSize - gfx::PlatformFont::kDefaultBaseFontSize;
       break;
     case CONTEXT_BODY_TEXT_LARGE:
       size_delta = kBodyTextLargeSize - gfx::PlatformFont::kDefaultBaseFontSize;
       break;
-    case views::style::CONTEXT_BUTTON:
-      font_weight = kButtonFontWeight;
+    case CONTEXT_HEADLINE:
+      size_delta = kHeadlineSize - gfx::PlatformFont::kDefaultBaseFontSize;
       break;
     default:
       break;
   }
 
   // Ignore |text_style| since it only affects color in the Harmony spec.
+
   return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
       size_delta, gfx::Font::NORMAL, font_weight);
 }
 
 SkColor HarmonyTypographyProvider::GetColor(int text_context,
                                             int text_style) const {
   // TODO(tapted): Look up colors from the spec.
   return SK_ColorBLACK;
 }
 
@@ skipping 45 matching lines @@
       GetFont(views::style::CONTEXT_DIALOG_TITLE, kTemplateStyle).GetHeight() -
       kTitlePlatformHeight + kTitleHeight;
   static const int body_large_height =
       GetFont(CONTEXT_BODY_TEXT_LARGE, kTemplateStyle).GetHeight() -
       kBodyTextLargePlatformHeight + kBodyHeight;
   static const int default_height =
       GetFont(CONTEXT_BODY_TEXT_SMALL, kTemplateStyle).GetHeight() -
       kBodyTextSmallPlatformHeight + kBodyHeight;
 
   switch (text_context) {
-    case CONTEXT_HEADLINE:
-      return headline_height;
+    case views::style::CONTEXT_BUTTON:
+    case views::style::CONTEXT_BUTTON_MD:
+      return kButtonAbsoluteHeight;
     case views::style::CONTEXT_DIALOG_TITLE:
       return title_height;
     case CONTEXT_BODY_TEXT_LARGE:
       return body_large_height;
-    case views::style::CONTEXT_BUTTON:
-      return kButtonAbsoluteHeight;
+    case CONTEXT_HEADLINE:
+      return headline_height;
     default:
       return default_height;
   }
 }