Inactive toast ux changes

chrome/browser/ui/views/harmony/chrome_typography.h

Index: chrome/browser/ui/views/harmony/chrome_typography.h
diff --git a/chrome/browser/ui/views/harmony/chrome_typography.h b/chrome/browser/ui/views/harmony/chrome_typography.h
index 84bb16f3782e7d1da6b20fb24febac5d9a43e3c8..98eadbc96e1a2d88d1fa25318c8003d6ed1d5c7a 100644
--- a/chrome/browser/ui/views/harmony/chrome_typography.h
+++ b/chrome/browser/ui/views/harmony/chrome_typography.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_HARMONY_CHROME_TYPOGRAPHY_H_
 
 #include "base/macros.h"
+#include "ui/gfx/platform_font.h"

[tapted, 2017/07/07 03:32:19]

nit: move to .cc. Here, I guess we need gfx::Font::Weight, but that's in
ui/gfx/font.h

[skare_, 2017/07/21 03:11:35]

Done.

 #include "ui/views/style/typography.h"
 #include "ui/views/style/typography_provider.h"
 
@@ -29,6 +30,10 @@ enum ChromeTextContext {
   // "Body 2". Usually 12pt.
   CONTEXT_BODY_TEXT_SMALL,
 
+  // Text for titles, body text and buttons that appear in dialogs attempting to
+  // mimic the native Windows 10 look and feel.
+  CONTEXT_WINDOWS10_NATIVE,
+
   // ResourceBundle::SmallFont (11 pt). There is no equivalent in the Harmony
   // spec, so new code should not be using this. It is only provided to avoid
   // changing existing UI and it will eventually be removed.
@@ -55,6 +60,13 @@ enum ChromeTextStyle {
   STYLE_EMPHASIZED,
 };
 
+// Sets the |size_delta| and |font_weight| for text that should not be affected
+// by the Harmony spec.
+void ApplyCommonFontStyles(int context,
+                           int style,
+                           int* size_delta,
+                           gfx::Font::Weight* weight);
+
 // TypographyProvider that provides pre-Harmony fonts in Chrome.
 class LegacyTypographyProvider : public views::DefaultTypographyProvider {
  public: