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

views/widget/tooltip_manager_win.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/widget/tooltip_manager_win.h"
 
 #include <windowsx.h>
 #include <limits>
 
 #include "app/l10n_util_win.h"
@@ skipping 19 matching lines @@
 int TooltipManager::GetTooltipHeight() {
   DCHECK(tooltip_height_ > 0);
   return tooltip_height_;
 }
 
 static gfx::Font DetermineDefaultFont() {
   HWND window = CreateWindowEx(
       WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(),
       TOOLTIPS_CLASS, NULL, 0 , 0, 0, 0, 0, NULL, NULL, NULL, NULL);
   HFONT hfont = reinterpret_cast<HFONT>(SendMessage(window, WM_GETFONT, 0, 0));
-  gfx::Font font = hfont ? gfx::Font::CreateFont(hfont) : gfx::Font();
+  gfx::Font font = hfont ? gfx::Font(hfont) : gfx::Font();
   DestroyWindow(window);
   return font;
 }
 
 // static
 gfx::Font TooltipManager::GetDefaultFont() {
   static gfx::Font* font = NULL;
   if (!font)
     font = new gfx::Font(DetermineDefaultFont());
   return *font;
@@ skipping 202 matching lines @@
     TEXTMETRIC font_metrics;
     GetTextMetrics(dc, &font_metrics);
     height = font_metrics.tmHeight;
     // To avoid the DC referencing font_handle_, select the previous font.
     SelectObject(dc, previous_font);
     SetMapMode(dc, last_map_mode);
     ReleaseDC(NULL, dc);
   } else {
     // Tooltip is using the system font. Use gfx::Font, which should pick
     // up the system font.
-    height = gfx::Font().height();
+    height = gfx::Font().GetHeight();
   }
   // Get the margins from the tooltip
   RECT tooltip_margin;
   SendMessage(tooltip_hwnd_, TTM_GETMARGIN, 0, (LPARAM)&tooltip_margin);
   return height + tooltip_margin.top + tooltip_margin.bottom;
 }
 
 void TooltipManagerWin::UpdateTooltip(const gfx::Point& mouse_pos) {
   RootView* root_view = widget_->GetRootView();
   View* view = root_view->GetViewForPoint(mouse_pos);
@@ skipping 102 matching lines @@
     keyboard_tooltip_hwnd_ = NULL;
   }
 }
 
 void TooltipManagerWin::DestroyKeyboardTooltipWindow(HWND window_to_destroy) {
   if (keyboard_tooltip_hwnd_ == window_to_destroy)
     HideKeyboardTooltip();
 }
 
 }  // namespace views