Vertically align text on empty bookmarks bar

chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_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/bookmarks/bookmark_bar_instructions_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 22 matching lines @@
   return 6;
 }
 
 }  // namespace
 
 BookmarkBarInstructionsView::BookmarkBarInstructionsView(
     BookmarkBarInstructionsDelegate* delegate)
     : delegate_(delegate),
       instructions_(NULL),
       import_link_(NULL),
-      baseline_(-1),
       updated_colors_(false) {
   instructions_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_BOOKMARKS_NO_ITEMS));
   instructions_->SetAutoColorReadabilityEnabled(false);
   instructions_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(instructions_);
 
   if (browser_defaults::kShowImportOnBookmarkBar) {
     import_link_ = new views::Link(
         l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_IMPORT_LINK));
     // We don't want the link to alter tab navigation.
     import_link_->SetFocusBehavior(FocusBehavior::NEVER);
     import_link_->set_listener(this);
     import_link_->set_context_menu_controller(this);
     import_link_->SetAutoColorReadabilityEnabled(false);
     import_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(import_link_);
   }
 }
 
 gfx::Size BookmarkBarInstructionsView::GetPreferredSize() const {
-  int ascent = 0, descent = 0, height = 0, width = 0;
+  int height = 0, width = 0;
   for (int i = 0; i < child_count(); ++i) {
     const views::View* view = child_at(i);
     gfx::Size pref = view->GetPreferredSize();
-    int baseline = view->GetBaseline();
-    if (baseline != -1) {
-      ascent = std::max(ascent, baseline);
-      descent = std::max(descent, pref.height() - baseline);
-    } else {
-      height = std::max(pref.height(), height);
-    }
+    height = std::max(pref.height(), height);
     width += pref.width();
   }
   width += (child_count() - 1) * GetViewPadding();
-  if (ascent != 0)
-    height = std::max(ascent + descent, height);
   return gfx::Size(width, height);
 }
 
 void BookmarkBarInstructionsView::Layout() {
   int remaining_width = width();
   int x = 0;
   for (int i = 0; i < child_count(); ++i) {
     views::View* view = child_at(i);
     gfx::Size pref = view->GetPreferredSize();
-    int baseline = view->GetBaseline();
-    int y;
-    if (baseline != -1 && baseline_ != -1)
-      y = baseline_ - baseline;
-    else
-      y = (height() - pref.height()) / 2;
     int view_width = std::min(remaining_width, pref.width());
-    view->SetBounds(x, y, view_width, pref.height());
+    view->SetBounds(x, 0, view_width, height());
     x += view_width + GetViewPadding();
     remaining_width = std::max(0, width() - x);
   }
 }
 
 const char* BookmarkBarInstructionsView::GetClassName() const {
   return "BookmarkBarInstructionsView";
 }
 
 void BookmarkBarInstructionsView::OnThemeChanged() {
@@ skipping 45 matching lines @@
     // code (which only adjusts luminance) doesn't work well in this case.
     SkColor bg = theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR);
     SkColor link_color =
         GetNativeTheme()->GetSystemColor(ui::NativeTheme::kColorId_LinkEnabled);
     bool link_has_contrast = color_utils::GetContrastRatio(link_color, bg) >=
                              color_utils::kMinimumReadableContrastRatio;
     import_link_->SetUnderline(!link_has_contrast);
     import_link_->SetEnabledColor(link_has_contrast ? link_color : text_color);
   }
 }