Always aligns text at vertically center (Textfield, Label).

chrome/browser/ui/views/location_bar/icon_label_bubble_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/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/painter.h"
 
 
 IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
                                          const int hover_background_images[],
                                          int contained_image,
                                          const gfx::FontList& font_list,
-                                         int font_y_offset,
                                          SkColor text_color,
                                          SkColor parent_background_color,
                                          bool elide_in_middle)
     : background_painter_(
           views::Painter::CreateImageGridPainter(background_images)),
       image_(new views::ImageView()),
       label_(new views::Label(string16(), font_list)),
       is_extension_icon_(false),
       in_hover_(false) {
   image_->SetImage(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           contained_image));
 
   // Disable separate hit testing for |image_|.  This prevents views treating
   // |image_| as a separate mouse hover region from |this|.
   image_->set_interactive(false);
   AddChildView(image_);
 
   if (hover_background_images) {
     hover_background_painter_.reset(
         views::Painter::CreateImageGridPainter(hover_background_images));
   }
 
-  label_->set_border(views::Border::CreateEmptyBorder(font_y_offset, 0, 0, 0));
   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 29 matching lines @@
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(label_->GetPreferredSize().width());
 }
 
 void IconLabelBubbleView::Layout() {
   image_->SetBounds(GetBubbleOuterPadding(!is_extension_icon_), 0,
                     image_->GetPreferredSize().width(), height());
   const int pre_label_width = GetPreLabelWidth();
   label_->SetBounds(pre_label_width, 0,
                     width() - pre_label_width - GetBubbleOuterPadding(false),
-                    label_->GetPreferredSize().height());
+                    height());
 }
 
 gfx::Size IconLabelBubbleView::GetSizeForLabelWidth(int width) const {
   gfx::Size size(GetPreLabelWidth() + width + GetBubbleOuterPadding(false), 0);
   size.SetToMax(background_painter_->GetMinimumSize());
   return size;
 }
 
 void IconLabelBubbleView::OnMouseEntered(const ui::MouseEvent& event) {
   in_hover_ = true;
@@ skipping 17 matching lines @@
   views::Painter* painter = (in_hover_ && hover_background_painter_) ?
       hover_background_painter_.get() : background_painter_.get();
   painter->Paint(canvas, size());
 }
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
   const int image_width = image_->GetPreferredSize().width();
   return GetBubbleOuterPadding(true) +
       (image_width ? (image_width + LocationBarView::GetItemPadding()) : 0);
 }