Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3329)

Unified Diff: chrome/browser/ui/views/harmony/chrome_typography.h

Issue 2801583002: Use views::style for buttons, bootstrap ash_typography to do so. (Closed)
Patch Set: placate gn check. new_avatar_button now just avatar_button Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9f89400f179020d59b62268fb20e7b4f9597aa13..3d626d4fbe6ecd3598ec12c78b6f68e7a1558769 100644
--- a/chrome/browser/ui/views/harmony/chrome_typography.h
+++ b/chrome/browser/ui/views/harmony/chrome_typography.h
@@ -9,9 +9,19 @@
#include "ui/views/style/typography.h"
#include "ui/views/style/typography_provider.h"
+#if defined(USE_ASH)
+#include "ash/public/cpp/ash_typography.h"
+#endif
+
enum ChromeTextContext {
+#if defined(USE_ASH)
+ CHROME_TEXT_CONTEXT_START = ash::ASH_TEXT_CONTEXT_END,
+#else
+ CHROME_TEXT_CONTEXT_START = views::style::VIEWS_TEXT_CONTEXT_END,
+#endif
+
// Headline text. Usually 20pt. Never multi-line.
- CONTEXT_HEADLINE = views::style::VIEWS_TEXT_CONTEXT_END,
+ CONTEXT_HEADLINE = CHROME_TEXT_CONTEXT_START,
// "Body 1". Usually 13pt.
CONTEXT_BODY_TEXT_LARGE,
@@ -26,8 +36,10 @@ enum ChromeTextContext {
};
enum ChromeTextStyle {
+ CHROME_TEXT_STYLE_START = views::style::VIEWS_TEXT_STYLE_END,
+
// Secondary text. May be lighter than views::style::PRIMARY.
- STYLE_SECONDARY = views::style::VIEWS_TEXT_STYLE_END,
+ STYLE_SECONDARY = CHROME_TEXT_STYLE_START,
// "Hint" text, usually a line that gives context to something more important.
STYLE_HINT,

Powered by Google App Engine
This is Rietveld 408576698