diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
| commit | fd85ad650d68309b965dbc9f3d6823cf2754349c (patch) | |
| tree | 28b98629e02b2e05ec74272146f249ca62a164da /printing | |
| parent | ce072a7181ea5d58133e33654133236f5d9f5551 (diff) | |
| download | chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.zip chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.gz chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.bz2 | |
Move app/win_util to app/win and fix the namespace usage.
Split out the two classes: ScopedComInitializer and ScopedCOMem (which I renamed) to separate files.
I removed the win_util_path file which had one function in it and moved the function to win_util.
Somehow, this was getting picked up by the nacl64 build and the call in sandbox_policy was then not being
defined. I just implemented the function in-plcae since it's just a simple wrapper around a Windows API call.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6013009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printed_document_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/printing/printed_document_win.cc b/printing/printed_document_win.cc index d157aef..892de34 100644 --- a/printing/printed_document_win.cc +++ b/printing/printed_document_win.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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 "app/win_util.h" +#include "app/win/win_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -121,9 +121,9 @@ void PrintedDocument::Immutable::SetDocumentDate() { SYSTEMTIME systemtime; GetLocalTime(&systemtime); date_ = - WideToUTF16Hack(win_util::FormatSystemDate(systemtime, std::wstring())); + WideToUTF16Hack(app::win::FormatSystemDate(systemtime, std::wstring())); time_ = - WideToUTF16Hack(win_util::FormatSystemTime(systemtime, std::wstring())); + WideToUTF16Hack(app::win::FormatSystemTime(systemtime, std::wstring())); } void PrintedDocument::DrawHeaderFooter(gfx::NativeDrawingContext context, |