diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 13:57:10 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 13:57:10 +0000 |
| commit | 60741b476f12d0a9a7a0adac446d1af75d1208af (patch) | |
| tree | 97cf98a024b22840a7a0f1b3a0520cce8d919949 /printing/page_overlays.cc | |
| parent | 12b38f6e0866c6a88f0724395ed8a60a8eaf1bd3 (diff) | |
| download | chromium_src-60741b476f12d0a9a7a0adac446d1af75d1208af.zip chromium_src-60741b476f12d0a9a7a0adac446d1af75d1208af.tar.gz chromium_src-60741b476f12d0a9a7a0adac446d1af75d1208af.tar.bz2 | |
Fix printing project on linux.
Enable compilation of every files and fix tests.
TEST=unit tests
BUG=9847
Review URL: http://codereview.chromium.org/193086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/page_overlays.cc')
| -rw-r--r-- | printing/page_overlays.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/printing/page_overlays.cc b/printing/page_overlays.cc index e590490..446e9dd 100644 --- a/printing/page_overlays.cc +++ b/printing/page_overlays.cc @@ -84,8 +84,9 @@ const std::wstring& PageOverlays::GetOverlay(HorizontalPosition x, return EmptyWString(); } -void PageOverlays::SetOverlay(HorizontalPosition x, VerticalPosition y, - std::wstring& input) { +void PageOverlays::SetOverlay(HorizontalPosition x, + VerticalPosition y, + const std::wstring& input) { switch (x) { case LEFT: switch (y) { @@ -137,9 +138,6 @@ std::wstring PageOverlays::ReplaceVariables(const std::wstring& input, const PrintedDocument& document, const PrintedPage& page) { std::wstring output(input); -// Prevent references to document.page_count() on Linux until -// printed_document.cc is included in printing.gyp. -#if !defined(OS_LINUX) for (size_t offset = output.find(L'{', 0); offset != std::wstring::npos; offset = output.find(L'{', offset)) { @@ -203,7 +201,6 @@ std::wstring PageOverlays::ReplaceVariables(const std::wstring& input, ++offset; } } -#endif // !defined(OS_LINUX) return output; } |