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

Unified 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, 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
« no previous file with comments | « no previous file | ui/views/style/typography.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/style/typography.h
diff --git a/ui/views/style/typography.h b/ui/views/style/typography.h
index ef17cc11155fa392551ede05d953ff70b964bbbc..29295a415834833e96fa4a6c264e063e5b92dbdb 100644
--- a/ui/views/style/typography.h
+++ b/ui/views/style/typography.h
@@ -89,14 +89,14 @@ enum TextStyle {
};
// Helpers to obtain text properties from the TypographyProvider given by the
-// current ViewsDelegate. |text_context| can be an enum value from TextContext,
-// or a value understood by the embedder's TypographyProvider. Similarly,
-// |text_style| corresponds to TextStyle.
-VIEWS_EXPORT const gfx::FontList& GetFont(int text_context, int text_style);
-VIEWS_EXPORT SkColor GetColor(int text_context,
- int text_style,
+// current LayoutProvider. |context| can be an enum value from TextContext, or a
+// value understood by the embedder's TypographyProvider. Similarly, |style|
+// corresponds to TextStyle.
+VIEWS_EXPORT const gfx::FontList& GetFont(int context, int style);
+VIEWS_EXPORT SkColor GetColor(int context,
+ int style,
const ui::NativeTheme* theme);
-VIEWS_EXPORT int GetLineHeight(int text_context, int text_style);
+VIEWS_EXPORT int GetLineHeight(int context, int style);
} // namespace style
} // namespace views
« 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