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

views/controls/textfield/textfield.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 "views/controls/textfield/textfield.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdkkeysyms.h>
 #endif
 
@@ skipping 207 matching lines @@
     native_wrapper_->GetView()->Layout();
   }
 }
 
 gfx::Size Textfield::GetPreferredSize() {
   gfx::Insets insets;
   if (draw_border_ && native_wrapper_)
     insets = native_wrapper_->CalculateInsets();
   return gfx::Size(font_.GetExpectedTextWidth(default_width_in_chars_) +
                        insets.width(),
-                   num_lines_ * font_.height() + insets.height());
+                   num_lines_ * font_.GetHeight() + insets.height());
 }
 
 bool Textfield::IsFocusable() const {
   return IsEnabled() && !read_only_;
 }
 
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll();
 }
 
@@ skipping 116 matching lines @@
       GDK_CONTROL_MASK;
 }
 
 bool Textfield::Keystroke::IsShiftHeld() const {
   return (event_.state & gtk_accelerator_get_default_mod_mask()) ==
       GDK_SHIFT_MASK;
 }
 #endif
 
 }  // namespace views