Rework gfx::Font by moving platform-specific code into inner classes....

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2010 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/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/bidi_line_iterator.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ skipping 295 matching lines @@
 
     DrawString(canvas, match_.description, match_.description_class, true, x,
                text_bounds_.y());
   }
 }
 
 void AutocompleteResultView::Layout() {
   icon_bounds_.SetRect(LocationBarView::kEdgeItemPadding,
                        (height() - icon_size_) / 2, icon_size_, icon_size_);
   int text_x = icon_bounds_.right() + LocationBarView::kItemPadding;
-  int font_height = std::max(normal_font_.height(), bold_font_.height());
+  int font_height = std::max(normal_font_.GetHeight(), bold_font_.GetHeight());
   text_bounds_.SetRect(text_x, std::max(0, (height() - font_height) / 2),
       std::max(bounds().width() - text_x - LocationBarView::kEdgeItemPadding,
       0), font_height);
 }
 
 gfx::Size AutocompleteResultView::GetPreferredSize() {
   return gfx::Size(0, GetPreferredHeight(normal_font_, bold_font_));
 }
 
 // static
 int AutocompleteResultView::GetPreferredHeight(
     const gfx::Font& font,
     const gfx::Font& bold_font) {
-  int text_height = std::max(font.height(), bold_font.height()) +
+  int text_height = std::max(font.GetHeight(), bold_font.GetHeight()) +
       (kTextVerticalPadding * 2);
   int icon_height = icon_size_ + (kIconVerticalPadding * 2);
   return std::max(icon_height, text_height);
 }
 
 // static
 bool AutocompleteResultView::SortRunsLogically(const RunData& lhs,
                                                const RunData& rhs) {
   return lhs.run_start < rhs.run_start;
 }
@@ skipping 161 matching lines @@
     int flags = gfx::Canvas::NO_ELLIPSIS;  // We've already elided.
     if (reverse_visible_order) {
       std::reverse(i->classifications.begin(), i->classifications.end());
       if (i->is_rtl)
         flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
     }
     for (Classifications::const_iterator j(i->classifications.begin());
          j != i->classifications.end(); ++j) {
       int left = mirroring_context_->mirrored_left_coord(x, x + j->pixel_width);
       canvas->DrawStringInt(j->text, *j->font, j->color, left, y,
-                            j->pixel_width, j->font->height(), flags);
+                            j->pixel_width, j->font->GetHeight(), flags);
       x += j->pixel_width;
     }
   }
 
   return x;
 }
 
 void AutocompleteResultView::Elide(Runs* runs, int remaining_width) const {
   // The complexity of this function is due to edge cases like the following:
   // We have 100 px of available space, an initial classification that takes 86
@@ skipping 479 matching lines @@
     // bubble appear at the same height as the Star bubble.
     location_bar_bounds.Inset(LocationBarView::kNormalHorizontalEdgeThickness,
                               0);
   }
   gfx::Point location_bar_origin(location_bar_bounds.origin());
   views::View::ConvertPointToScreen(location_bar_, &location_bar_origin);
   location_bar_bounds.set_origin(location_bar_origin);
   return bubble_border_->GetBounds(
       location_bar_bounds, gfx::Size(location_bar_bounds.width(), h));
 }