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

views/controls/button/native_button.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/native_button.h"
 
-#if defined(OS_LINUX)
-#include <gdk/gdkkeysyms.h>
-#include "views/screen.h"
-#endif
-
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 
+#if defined(OS_WIN)
+#include "gfx/platform_font_win.h"
+#elif defined(OS_LINUX)
+#include <gdk/gdkkeysyms.h>
+#include "views/screen.h"
+#endif
+
+
 namespace views {
 
 #if defined(OS_WIN)
 // The min size in DLUs comes from
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch14e.asp
 static const int kMinWidthDLUs = 50;
 static const int kMinHeightDLUs = 14;
 
 // Horizontal padding (on each side).
 static const int kButtonBorderHWidth = 8;
@@ skipping 110 matching lines @@
 
   // Add in the border size. (Do this before clamping the minimum size in case
   // that clamping causes an increase in size that would include the borders.
   gfx::Insets border = GetInsets();
   sz.set_width(sz.width() + border.left() + border.right());
   sz.set_height(sz.height() + border.top() + border.bottom());
 
 #if defined(OS_WIN)
   // Clamp the size returned to at least the minimum size.
   if (!ignore_minimum_size_) {
-    sz.set_width(std::max(sz.width(),
-                          font_.horizontal_dlus_to_pixels(kMinWidthDLUs)));
-    sz.set_height(std::max(sz.height(),
-                           font_.vertical_dlus_to_pixels(kMinHeightDLUs)));
+    gfx::PlatformFontWin* platform_font =
+        static_cast<gfx::PlatformFontWin*>(font_.platform_font());
+    sz.set_width(std::max(
+        sz.width(),
+        platform_font->horizontal_dlus_to_pixels(kMinWidthDLUs)));
+    sz.set_height(std::max(
+        sz.height(),
+        platform_font->vertical_dlus_to_pixels(kMinHeightDLUs)));
   }
   // GTK returns a meaningful preferred size so that we don't need to adjust
   // the preferred size as we do on windows.
 #endif
 
   return sz;
 }
 
 void NativeButton::Layout() {
   if (native_wrapper_) {
@@ skipping 64 matching lines @@
   native_wrapper->UpdateEnabled();
   return native_wrapper;
 }
 
 void NativeButton::InitBorder() {
   set_border(Border::CreateEmptyBorder(0, kButtonBorderHWidth, 0,
                                        kButtonBorderHWidth));
 }
 
 }  // namespace views