Center the font height instead of cap height when cap height is not supported.

chrome/browser/ui/views/location_bar/location_bar_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/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 128 matching lines @@
 //     y offset >= 0
 //     space at bottom >= 0
 //     (i.e. Entire font must be visible inside the box.)
 gfx::FontList GetLargestFontListWithHeightBound(
     const gfx::FontList& base_font_list,
     int height) {
   gfx::FontList font_list = base_font_list;
   for (int font_size = font_list.GetFontSize(); font_size > 1; --font_size) {
     const int internal_leading =
         font_list.GetBaseline() - font_list.GetCapHeight();
-    const int space = height - font_list.GetCapHeight();
+    // Some platforms don't support getting the cap height, and simply return
+    // the entire font ascent from GetCapHeight().  Centering the ascent makes
+    // the font look too low, so if GetCapHeight() returns the ascent, center
+    // the entire font height instead.
+    const int space =
+        height - ((internal_leading != 0) ?
+                  font_list.GetCapHeight() : font_list.GetHeight());
     const int y_offset = space / 2 - internal_leading;
     const int space_at_bottom = height - (y_offset + font_list.GetHeight());
     if ((y_offset >= 0) && (space_at_bottom >= 0))
       break;
     font_list = font_list.DeriveFontListWithSizeDelta(-1);
   }
   return font_list;
 }
 
 }  // namespace
@@ skipping 1371 matching lines @@
     bounds.Inset(-(horizontal_padding + 1) / 2, 0);
     location_bar_util::PaintExtensionActionBackground(
         *(*page_action_view)->image_view()->page_action(),
         tab_id, canvas, bounds, text_color, background_color);
   }
 }
 
 void LocationBarView::AccessibilitySetValue(const string16& new_value) {
   location_entry_->SetUserText(new_value);
 }