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

Side by Side Diff: ui/views/style/typography.h

Issue 2918003002: Remove text_ prefixes from the views::style::Get* helper args. (Closed)
Patch Set: rebase Created 3 years, 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/style/typography.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_STYLE_TYPOGRAPHY_H_ 5 #ifndef UI_VIEWS_STYLE_TYPOGRAPHY_H_
6 #define UI_VIEWS_STYLE_TYPOGRAPHY_H_ 6 #define UI_VIEWS_STYLE_TYPOGRAPHY_H_
7 7
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 #include "ui/views/views_export.h" 9 #include "ui/views/views_export.h"
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 STYLE_TAB_HOVERED, 82 STYLE_TAB_HOVERED,
83 83
84 // Inactive tab in a tabbed pane. 84 // Inactive tab in a tabbed pane.
85 STYLE_TAB_INACTIVE, 85 STYLE_TAB_INACTIVE,
86 86
87 // Embedders must start TextStyle enum values from here. 87 // Embedders must start TextStyle enum values from here.
88 VIEWS_TEXT_STYLE_END 88 VIEWS_TEXT_STYLE_END
89 }; 89 };
90 90
91 // Helpers to obtain text properties from the TypographyProvider given by the 91 // Helpers to obtain text properties from the TypographyProvider given by the
92 // current ViewsDelegate. |text_context| can be an enum value from TextContext, 92 // current LayoutProvider. |context| can be an enum value from TextContext, or a
93 // or a value understood by the embedder's TypographyProvider. Similarly, 93 // value understood by the embedder's TypographyProvider. Similarly, |style|
94 // |text_style| corresponds to TextStyle. 94 // corresponds to TextStyle.
95 VIEWS_EXPORT const gfx::FontList& GetFont(int text_context, int text_style); 95 VIEWS_EXPORT const gfx::FontList& GetFont(int context, int style);
96 VIEWS_EXPORT SkColor GetColor(int text_context, 96 VIEWS_EXPORT SkColor GetColor(int context,
97 int text_style, 97 int style,
98 const ui::NativeTheme* theme); 98 const ui::NativeTheme* theme);
99 VIEWS_EXPORT int GetLineHeight(int text_context, int text_style); 99 VIEWS_EXPORT int GetLineHeight(int context, int style);
100 100
101 } // namespace style 101 } // namespace style
102 } // namespace views 102 } // namespace views
103 103
104 #endif // UI_VIEWS_STYLE_TYPOGRAPHY_H_ 104 #endif // UI_VIEWS_STYLE_TYPOGRAPHY_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/style/typography.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698