| 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..f3a9894f38b86d4353bd008ba9604efc5e42c048 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/font.h"
|
| #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:
|
|
|