| Index: ui/views/style/typography.h
|
| diff --git a/ui/views/style/typography.h b/ui/views/style/typography.h
|
| index 055361a27747e19b91d8ecd8f6a0f606634c0dc6..06438e91288456dc9b83ff8c585a54da63e12954 100644
|
| --- a/ui/views/style/typography.h
|
| +++ b/ui/views/style/typography.h
|
| @@ -24,17 +24,21 @@ enum TextContext {
|
| // "CONTEXT_" represent the actual TextContexts: the rest are markers.
|
| VIEWS_TEXT_CONTEXT_START = 0,
|
|
|
| + // Text that appears on a dialog button control. Usually 12pt.
|
| + CONTEXT_DIALOG_BUTTON = VIEWS_TEXT_CONTEXT_START,
|
| +
|
| // A title for a dialog window. Usually 15pt. Multi-line OK.
|
| - CONTEXT_DIALOG_TITLE = VIEWS_TEXT_CONTEXT_START,
|
| + CONTEXT_DIALOG_TITLE,
|
|
|
| - // Text to label a control, usually next to it. "Body 2". Usually 12pt.
|
| + // Text to label a control, usually next to it. "Body 2". Usually 12pt. This
|
| + // includes controls with button-like behaviour, such as Checkbox.
|
| CONTEXT_LABEL,
|
|
|
| // An editable text field. Usually matches CONTROL_LABEL.
|
| CONTEXT_TEXTFIELD,
|
|
|
| - // Text that appears on a button control. Usually 12pt.
|
| - CONTEXT_BUTTON,
|
| + // 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,
|
| @@ -55,6 +59,9 @@ enum TextStyle {
|
| // contexts (e.g. BUTTON_TEXT, FIELD).
|
| STYLE_PRIMARY = VIEWS_TEXT_STYLE_START,
|
|
|
| + // Style for the default button on a dialog.
|
| + STYLE_DIALOG_BUTTON_DEFAULT,
|
| +
|
| // Disabled "greyed out" text.
|
| STYLE_DISABLED,
|
|
|
|
|