Remove app/win/win_util.h,cc etc.

printing/printed_document_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "app/win/win_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "printing/page_number.h"
 #include "printing/page_overlays.h"
 #include "printing/printed_pages_source.h"
 #include "printing/printed_page.h"
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
 
 namespace {
 
 void SimpleModifyWorldTransform(HDC context,
                                 int offset_x,
                                 int offset_y,
                                 double shrink_factor) {
   XFORM xform = { 0 };
   xform.eDx = static_cast<float>(offset_x);
   xform.eDy = static_cast<float>(offset_y);
   xform.eM11 = xform.eM22 = static_cast<float>(1. / shrink_factor);
   BOOL res = ModifyWorldTransform(context, &xform, MWT_LEFTMULTIPLY);
   DCHECK_NE(res, 0);
 }
 
 void DrawRect(HDC context, gfx::Rect rect) {
   Rectangle(context, rect.x(), rect.y(), rect.right(), rect.bottom());
 }
 
+// Creates a string interpretation of the time of day represented by the given
+// SYSTEMTIME that's appropriate for the user's default locale.
+// Format can be an empty string (for the default format), or a "format picture"
+// as specified in the Windows documentation for GetTimeFormat().
+string16 FormatSystemTime(const SYSTEMTIME& time, const string16& format) {
+  // If the format string is empty, just use the default format.
+  LPCTSTR format_ptr = NULL;
+  if (!format.empty())
+    format_ptr = format.c_str();
+
+  int buffer_size = GetTimeFormat(LOCALE_USER_DEFAULT, NULL, &time, format_ptr,
+                                  NULL, 0);
+
+  string16 output;
+  GetTimeFormat(LOCALE_USER_DEFAULT, NULL, &time, format_ptr,
+                WriteInto(&output, buffer_size), buffer_size);
+
+  return output;
+}
+
+// Creates a string interpretation of the date represented by the given
+// SYSTEMTIME that's appropriate for the user's default locale.
+// Format can be an empty string (for the default format), or a "format picture"
+// as specified in the Windows documentation for GetDateFormat().
+string16 FormatSystemDate(const SYSTEMTIME& date, const string16& format) {
+  // If the format string is empty, just use the default format.
+  LPCTSTR format_ptr = NULL;
+  if (!format.empty())
+    format_ptr = format.c_str();
+
+  int buffer_size = GetDateFormat(LOCALE_USER_DEFAULT, NULL, &date, format_ptr,
+                                  NULL, 0);
+
+  string16 output;
+  GetDateFormat(LOCALE_USER_DEFAULT, NULL, &date, format_ptr,
+                WriteInto(&output, buffer_size), buffer_size);
+
+  return output;
+}
+
 }  // namespace
 
 namespace printing {
 
 void PrintedDocument::RenderPrintedPage(
     const PrintedPage& page, gfx::NativeDrawingContext context) const {
 #ifndef NDEBUG
   {
     // Make sure the page is from our list.
     base::AutoLock lock(lock_);
@@ skipping 67 matching lines @@
                     font);
   int res = RestoreDC(context, saved_state);
   DCHECK_NE(res, 0);
 }
 
 void PrintedDocument::Immutable::SetDocumentDate() {
   // Use the native time formatting for printing on Windows.
   SYSTEMTIME systemtime;
   GetLocalTime(&systemtime);
   date_ =
-      WideToUTF16Hack(app::win::FormatSystemDate(systemtime, std::wstring()));
+      WideToUTF16Hack(FormatSystemDate(systemtime, std::wstring()));
   time_ =
-      WideToUTF16Hack(app::win::FormatSystemTime(systemtime, std::wstring()));
+      WideToUTF16Hack(FormatSystemTime(systemtime, std::wstring()));
 }
 
 void PrintedDocument::DrawHeaderFooter(gfx::NativeDrawingContext context,
                                        std::wstring text,
                                        gfx::Rect bounds) const {
   // Save the state for the clipping region.
   int saved_state = SaveDC(context);
   DCHECK_NE(saved_state, 0);
 
   int result = IntersectClipRect(context, bounds.x(), bounds.y(),
                                  bounds.right() + 1, bounds.bottom() + 1);
   DCHECK(result == SIMPLEREGION || result == COMPLEXREGION);
   TextOut(context,
           bounds.x(), bounds.y(),
           text.c_str(),
           static_cast<int>(text.size()));
   int res = RestoreDC(context, saved_state);
   DCHECK_NE(res, 0);
 }
 
 }  // namespace printing