Index: ui/views/style/typography.h |
diff --git a/ui/views/style/typography.h b/ui/views/style/typography.h |
index 055361a27747e19b91d8ecd8f6a0f606634c0dc6..18509c3605309d8f2e99a60c81f075a17b7e3e15 100644 |
--- a/ui/views/style/typography.h |
+++ b/ui/views/style/typography.h |
@@ -33,9 +33,16 @@ enum TextContext { |
// An editable text field. Usually matches CONTROL_LABEL. |
CONTEXT_TEXTFIELD, |
- // Text that appears on a button control. Usually 12pt. |
+ // Text that appears on a button control. This includes controls with |
+ // button-like behaviour, such as Checkbox. Usually 12pt. |
CONTEXT_BUTTON, |
+ // Text that appears on a button control under material design. |
+ CONTEXT_BUTTON_MD, |
Peter Kasting
2017/04/08 01:38:54
I don't think I understand why we have to introduc
tapted
2017/04/10 12:27:33
The problem is that CONTEXT_BUTTON would also used
Peter Kasting
2017/04/10 22:56:02
But the downside of this is that these are now the
tapted
2017/04/11 01:56:50
Yup. Have restored the separate MD context. I agre
Peter Kasting
2017/04/11 02:24:20
Right, but if we can eliminate that behavioral spe
tapted
2017/04/12 07:31:48
I don't think CONTEXT_BUTTON_MD makes sense for La
|
+ |
+ // Text for the menu items that appear in the touch-selection context menu. |
+ CONTEXT_TOUCH_MENU, |
+ |
// Embedders must start TextContext enum values from this value. |
VIEWS_TEXT_CONTEXT_END, |
@@ -70,6 +77,9 @@ enum TextStyle { |
// Inactive tab in a tabbed pane. |
STYLE_TAB_INACTIVE, |
+ // Style for the default button on a dialog. |
+ STYLE_DEFAULT_DIALOG_BUTTON, |
Peter Kasting
2017/04/08 01:38:54
Nit: I'm inclined to name this STYLE_BUTTON_DIALOG
tapted
2017/04/10 12:27:33
Done. I caved in and sorted some stuff too ;)
|
+ |
// Embedders must start TextStyle enum values from here. |
VIEWS_TEXT_STYLE_END |
}; |