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

views/controls/button/checkbox.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/button/checkbox.h"
 
 #include "base/logging.h"
 #include "gfx/canvas.h"
 #include "views/controls/label.h"
 
@@ skipping 85 matching lines @@
     native_wrapper_->GetView()->SetBounds(0, 0, width(), height());
   } else {
     gfx::Size checkmark_prefsize =
         native_wrapper_->GetView()->GetPreferredSize();
     int label_x = checkmark_prefsize.width() + kCheckboxLabelSpacing +
         kLabelFocusPaddingHorizontal;
     label_->SetBounds(
         label_x, 0, std::max(0, width() - label_x -
             kLabelFocusPaddingHorizontal),
         height());
-    int first_line_height = label_->font().height();
+    int first_line_height = label_->font().GetHeight();
     native_wrapper_->GetView()->SetBounds(
         0, ((first_line_height - checkmark_prefsize.height()) / 2),
         checkmark_prefsize.width(), checkmark_prefsize.height());
   }
   native_wrapper_->GetView()->Layout();
 }
 
 void Checkbox::SetEnabled(bool enabled) {
   NativeButton::SetEnabled(enabled);
   if (label_)
@@ skipping 104 matching lines @@
 void Checkbox::Init(const std::wstring& label_text) {
   // Checkboxs don't need to enforce a minimum size.
   set_ignore_minimum_size(true);
   label_ = new Label(label_text);
   label_->SetHasFocusBorder(true);
   label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   AddChildView(label_);
 }
 
 }  // namespace views