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

Unified Diff: chrome/browser/ui/views/harmony/layout_delegate_unittest.cc

Issue 2801583002: Use views::style for buttons, bootstrap ash_typography to do so. (Closed)
Patch Set: rebase for epic ash file move Created 3 years, 8 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/layout_delegate_unittest.cc
diff --git a/chrome/browser/ui/views/harmony/layout_delegate_unittest.cc b/chrome/browser/ui/views/harmony/layout_delegate_unittest.cc
index a265ae7d353b08051af86cb5b58c5d0724c13249..248edc3569cd0b2dab12d9ed449635adfda98151 100644
--- a/chrome/browser/ui/views/harmony/layout_delegate_unittest.cc
+++ b/chrome/browser/ui/views/harmony/layout_delegate_unittest.cc
@@ -209,7 +209,7 @@ TEST(LayoutDelegateTest, FontSizeRelativeToBase) {
EXPECT_EQ(twelve,
GetFont(views::style::CONTEXT_TEXTFIELD, kStyle).GetFontSize());
EXPECT_EQ(twelve,
- GetFont(views::style::CONTEXT_BUTTON, kStyle).GetFontSize());
+ GetFont(views::style::CONTEXT_DIALOG_BUTTON, kStyle).GetFontSize());
#if defined(OS_MACOSX)
// We never exposed UI on Mac using these constants so it doesn't matter that
@@ -266,6 +266,6 @@ TEST(LayoutDelegateTest, TypographyLineHeight) {
// Buttons should specify zero line height (i.e. use the font's height) so
// buttons have flexibility to configure their own spacing.
- EXPECT_EQ(0,
- views::style::GetLineHeight(views::style::CONTEXT_BUTTON, kStyle));
+ EXPECT_EQ(0, views::style::GetLineHeight(views::style::CONTEXT_DIALOG_BUTTON,
+ kStyle));
}

Powered by Google App Engine
This is Rietveld 408576698