Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: printing/page_overlays.cc

Issue 193086: Fix printing project on linux. (Closed)
Patch Set: fix git error Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/page_overlays.h ('k') | printing/page_overlays_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/page_overlays.cc
diff --git a/printing/page_overlays.cc b/printing/page_overlays.cc
index e590490cf01dec54bd39931d5a90efc46795d162..446e9ddba2ccf52ac355afc2d98eb7bb6155cdc0 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;
}
« no previous file with comments | « printing/page_overlays.h ('k') | printing/page_overlays_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698