Fix typo leading to the use of the wrong font in location bar bubbles.

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 15 matching lines @@
 
 
 // static
 const int ContentSettingImageView::kOpenTimeMS = 150;
 const int ContentSettingImageView::kAnimationDurationMS =
     (kOpenTimeMS * 2) + kStayOpenTimeMS;
 
 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)
     : parent_(parent),
       content_setting_image_model_(
           ContentSettingImageModel::CreateContentSettingImageModel(
               content_type)),
       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),
       bubble_widget_(NULL) {
   icon_->SetHorizontalAlignment(views::ImageView::LEADING);
   AddChildView(icon_);
 
   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
   // middle pixel of the middle image of the background, which we treat as the
   // representative color of the entire background (reasonable, given the
   // current appearance of these images).  Then we alpha-blend it over the
   // parent background color to determine the actual color the label text will
   // sit atop.
   const SkBitmap& bitmap(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
@@ skipping 207 matching lines @@
       parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(
           ContentSettingBubbleModel::CreateContentSettingBubbleModel(
               parent_->delegate()->GetContentSettingBubbleModelDelegate(),
               web_contents, parent_->profile(),
               content_setting_image_model_->get_content_settings_type()),
           web_contents, this, views::BubbleBorder::TOP_RIGHT));
   bubble_widget_->AddObserver(this);
   bubble_widget_->Show();
 }