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

Unified Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 23537056: Fix typo leading to the use of the wrong font in location bar bubbles. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 3 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/location_bar/content_setting_image_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/content_setting_image_view.cc (revision 223497)
+++ chrome/browser/ui/views/location_bar/content_setting_image_view.cc (working copy)
@@ -33,7 +33,7 @@
ContentSettingImageView::ContentSettingImageView(
ContentSettingsType content_type,
LocationBarView* parent,
- const gfx::Font& font,
+ const gfx::FontList& font_list,
int font_y_offset,
SkColor text_color,
SkColor parent_background_color)
@@ -44,7 +44,7 @@
background_painter_(
views::Painter::CreateImageGridPainter(kBackgroundImages)),
icon_(new views::ImageView),
- text_label_(new views::Label),
+ text_label_(new views::Label(string16(), font_list)),
slide_animator_(this),
pause_animation_(false),
pause_animation_state_(0.0),
@@ -55,7 +55,6 @@
text_label_->SetVisible(false);
text_label_->set_border(
views::Border::CreateEmptyBorder(font_y_offset, 0, 0, 0));
- text_label_->SetFont(font);
text_label_->SetEnabledColor(text_color);
// Calculate the actual background color for the label. The background images
// are painted atop |parent_background_color|. We grab the color of the

Powered by Google App Engine
This is Rietveld 408576698