diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:16:10 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:16:10 +0000 |
| commit | 7d2d0d0e99f9e93c5d11a2276678a564a327d19e (patch) | |
| tree | c40ad023ca76cec3c8341caed2b85607512cc946 /printing | |
| parent | 0c04e204b075d4388591e1a0a581777d8293984f (diff) | |
| download | chromium_src-7d2d0d0e99f9e93c5d11a2276678a564a327d19e.zip chromium_src-7d2d0d0e99f9e93c5d11a2276678a564a327d19e.tar.gz chromium_src-7d2d0d0e99f9e93c5d11a2276678a564a327d19e.tar.bz2 | |
printing: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/669242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/page_overlays.cc | 4 | ||||
| -rw-r--r-- | printing/printed_document.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/printing/page_overlays.cc b/printing/page_overlays.cc index 446e9dd..e01b02e 100644 --- a/printing/page_overlays.cc +++ b/printing/page_overlays.cc @@ -7,6 +7,7 @@ #include "app/gfx/text_elider.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "printing/printed_document.h" #include "printing/printed_page.h" @@ -133,7 +134,7 @@ void PageOverlays::SetOverlay(HorizontalPosition x, } } -//static +// static std::wstring PageOverlays::ReplaceVariables(const std::wstring& input, const PrintedDocument& document, const PrintedPage& page) { @@ -141,7 +142,6 @@ std::wstring PageOverlays::ReplaceVariables(const std::wstring& input, for (size_t offset = output.find(L'{', 0); offset != std::wstring::npos; offset = output.find(L'{', offset)) { - if (0 == output.compare(offset, wcslen(kTitle), kTitle)) { diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 6058968..5f5f53c 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -4,7 +4,10 @@ #include "printing/printed_document.h" +#include <algorithm> #include <set> +#include <string> +#include <vector> #include "app/gfx/font.h" #include "app/gfx/text_elider.h" @@ -13,6 +16,7 @@ #include "base/message_loop.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/time.h" #include "base/i18n/time_formatting.h" #include "printing/page_number.h" |