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

chrome/browser/ui/views/location_bar/keyword_hint_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/keyword_hint_view.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 
 
 KeywordHintView::KeywordHintView(Profile* profile,
                                  const gfx::FontList& font_list,
-                                 int font_y_offset,
                                  SkColor text_color,
                                  SkColor background_color)
     : profile_(profile),
       tab_image_(new views::ImageView()) {
   leading_label_ =
-      CreateLabel(font_list, font_y_offset, text_color, background_color);
+      CreateLabel(font_list, text_color, background_color);
   tab_image_->SetImage(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_OMNIBOX_KEYWORD_HINT_TAB));
   AddChildView(tab_image_);
   trailing_label_ =
-      CreateLabel(font_list, font_y_offset, text_color, background_color);
+      CreateLabel(font_list, text_color, background_color);
 }
 
 KeywordHintView::~KeywordHintView() {
 }
 
 void KeywordHintView::SetKeyword(const string16& keyword) {
   keyword_ = keyword;
   if (keyword_.empty())
     return;
   DCHECK(profile_);
@@ skipping 27 matching lines @@
 gfx::Size KeywordHintView::GetMinimumSize() {
   // Height will be ignored by the LocationBarView.
   return tab_image_->GetPreferredSize();
 }
 
 void KeywordHintView::Layout() {
   int tab_width = tab_image_->GetPreferredSize().width();
   bool show_labels = (width() != tab_width);
   gfx::Size leading_size(leading_label_->GetPreferredSize());
   leading_label_->SetBounds(0, 0, show_labels ? leading_size.width() : 0,
-                            leading_size.height());
+                            height());
   tab_image_->SetBounds(leading_label_->bounds().right(), 0, tab_width,
                         height());
   gfx::Size trailing_size(trailing_label_->GetPreferredSize());
   trailing_label_->SetBounds(tab_image_->bounds().right(), 0,
                              show_labels ? trailing_size.width() : 0,
-                             trailing_size.height());
+                             height());
 }
 
 views::Label* KeywordHintView::CreateLabel(const gfx::FontList& font_list,
-                                           int font_y_offset,
                                            SkColor text_color,
                                            SkColor background_color) {
   views::Label* label = new views::Label(string16(), font_list);
-  label->set_border(views::Border::CreateEmptyBorder(font_y_offset, 0, 0, 0));
   label->SetEnabledColor(text_color);
   label->SetBackgroundColor(background_color);
   AddChildView(label);
   return label;
 }