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

printing/printed_document.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 "printing/printed_document.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 180 matching lines @@
   }
   const std::wstring& line = settings.overlays.GetOverlay(x, y);
   if (line.empty()) {
     return;
   }
   std::wstring output(PageOverlays::ReplaceVariables(line, *this, page));
   if (output.empty()) {
     // May happen if document name or url is empty.
     return;
   }
-  const gfx::Size string_size(font.GetStringWidth(output), font.height());
+  const gfx::Size string_size(font.GetStringWidth(output), font.GetHeight());
   gfx::Rect bounding;
   bounding.set_height(string_size.height());
   const gfx::Rect& overlay_area(
       settings.page_setup_device_units().overlay_area());
   // Hard code .25 cm interstice between overlays. Make sure that some space is
   // kept between each headers.
   const int interstice = ConvertUnit(250, kHundrethsMMPerInch,
                                      settings.device_units_per_inch());
   const int max_width = overlay_area.width() / 3 - interstice;
   const int actual_width = std::min(string_size.width(), max_width);
@@ skipping 114 matching lines @@
   date_ = win_util::FormatSystemDate(systemtime, std::wstring());
   time_ = win_util::FormatSystemTime(systemtime, std::wstring());
 #else  // OS_WIN
   Time now = Time::Now();
   date_ = base::TimeFormatShortDateNumeric(now);
   time_ = base::TimeFormatTimeOfDay(now);
 #endif  // OS_WIN
 }
 
 }  // namespace printing