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

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

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: Rebase (conflict in layout_delegate.h due to r457774) 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
« no previous file with comments | « no previous file | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | ui/gfx/render_text_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8c52f1c704e4d56f16600ae9019db30d0000c7e1 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));
+ {rb.GetFontListWithDelta(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));
+ {rb.GetFontListWithDelta(6, gfx::Font::FontStyle::NORMAL,
+ gfx::Font::Weight::NORMAL)});
tap_label_->SetBounds(0, kThrobberCircleViewWidth, kTapLabelWidth,
kTapLabelHeight);
tap_label_->SetEnabledColor(kTapHereLabelColor);
« no previous file with comments | « no previous file | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | ui/gfx/render_text_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698