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

Unified Diff: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: fix windows Created 3 years, 9 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/chromeos/display/touch_calibrator/touch_calibrator_view.cc
diff --git a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc
index da4cb55e9bdaf088c4786be91e0e7cefe137775e..9c06e3d36ae84897c8b3f8d782e8960c01ccfe6d 100644
--- a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc
+++ b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc
@@ -503,8 +503,8 @@ void TouchCalibratorView::InitViewContents() {
// calibration setup.
exit_label_ = new views::Label(
rb.GetLocalizedString(IDS_DISPLAY_TOUCH_CALIBRATION_EXIT_LABEL),
- rb.GetFontListWithDelta(8, gfx::Font::FontStyle::NORMAL,
- gfx::Font::Weight::NORMAL));
+ views::Label::CustomFont{rb.GetFontListWithDelta(
Peter Kasting 2017/03/14 23:53:33 Is the explicit "views::Label::CustomFont" necessa
tapted 2017/03/15 08:26:24 Hunh - you're right. It's not needed. Removed. I
+ 8, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL)});
exit_label_->SetBounds((display_.bounds().width() - kExitLabelWidth) / 2,
display_.bounds().height() * 3.f / 4, kExitLabelWidth,
kExitLabelHeight);
@@ -536,8 +536,8 @@ void TouchCalibratorView::InitViewContents() {
// Initialize the tap label.
tap_label_ = new views::Label(
rb.GetLocalizedString(IDS_DISPLAY_TOUCH_CALIBRATION_TAP_HERE_LABEL),
- rb.GetFontListWithDelta(6, gfx::Font::FontStyle::NORMAL,
- gfx::Font::Weight::NORMAL));
+ views::Label::CustomFont{rb.GetFontListWithDelta(
+ 6, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL)});
tap_label_->SetBounds(0, kThrobberCircleViewWidth, kTapLabelWidth,
kTapLabelHeight);
tap_label_->SetEnabledColor(kTapHereLabelColor);

Powered by Google App Engine
This is Rietveld 408576698