diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-31 17:29:25 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-31 17:29:25 +0000 |
| commit | e83326f8400791e92875546b2fd1885a3a17d1b1 (patch) | |
| tree | edbe773208b1a9f6965b45b55da10afd210ea7bb /printing | |
| parent | 8e0a03bf3b1aacaa7a2bc2561d8eb1b83eb9c2e5 (diff) | |
| download | chromium_src-e83326f8400791e92875546b2fd1885a3a17d1b1.zip chromium_src-e83326f8400791e92875546b2fd1885a3a17d1b1.tar.gz chromium_src-e83326f8400791e92875546b2fd1885a3a17d1b1.tar.bz2 | |
Convert more callers of the integer/string functions to using
string_number_conversions.h
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3013046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/image.cc | 4 | ||||
| -rw-r--r-- | printing/page_overlays.cc | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/printing/image.cc b/printing/image.cc index 77f5d5e..21ffd99 100644 --- a/printing/image.cc +++ b/printing/image.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/md5.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "gfx/codec/png_codec.h" #include "gfx/rect.h" #include "skia/ext/platform_device.h" @@ -96,7 +96,7 @@ Image::Image(const Image& image) std::string Image::checksum() const { MD5Digest digest; MD5Sum(&data_[0], data_.size(), &digest); - return HexEncode(&digest, sizeof(digest)); + return base::HexEncode(&digest, sizeof(digest)); } bool Image::SaveToPng(const FilePath& filepath) const { diff --git a/printing/page_overlays.cc b/printing/page_overlays.cc index 89353da..68c184b 100644 --- a/printing/page_overlays.cc +++ b/printing/page_overlays.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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. @@ -6,6 +6,7 @@ #include "app/text_elider.h" #include "base/logging.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "printing/printed_document.h" @@ -169,21 +170,21 @@ std::wstring PageOverlays::ReplaceVariables(const std::wstring& input, offset = ReplaceKey(&output, offset, wcslen(kPage), - IntToWString(page.page_number())); + UTF8ToWide(base::IntToString(page.page_number()))); } else if (0 == output.compare(offset, wcslen(kPageCount), kPageCount)) { offset = ReplaceKey(&output, offset, wcslen(kPageCount), - IntToWString(document.page_count())); + UTF8ToWide(base::IntToString(document.page_count()))); } else if (0 == output.compare(offset, wcslen(kPageOnTotal), kPageOnTotal)) { std::wstring replacement; - replacement = IntToWString(page.page_number()); + replacement = UTF8ToWide(base::IntToString(page.page_number())); replacement += L"/"; - replacement += IntToWString(document.page_count()); + replacement += UTF8ToWide(base::IntToString(document.page_count())); offset = ReplaceKey(&output, offset, wcslen(kPageOnTotal), |