summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 04:39:42 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 04:39:42 +0000
commitd125b8ef92a09f64732998f296c29b57805e7004 (patch)
tree4a97d4744de6c96e45fbdb3c78cbdd91c053e8a4 /printing
parent1f214e281d4b235245be5fb165441b9a87c237db (diff)
downloadchromium_src-d125b8ef92a09f64732998f296c29b57805e7004.zip
chromium_src-d125b8ef92a09f64732998f296c29b57805e7004.tar.gz
chromium_src-d125b8ef92a09f64732998f296c29b57805e7004.tar.bz2
More Aura fixes to build with chromeos==1
This is not enough to build without stubs for WmIpc, Bubble and ScreenLocker. TBR=sky@chromium.org BUG=97131 TEST=none Review URL: http://codereview.chromium.org/8233029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/printed_document_aura.cc2
-rw-r--r--printing/printing_context_aura.cc2
2 files changed, 1 insertions, 3 deletions
diff --git a/printing/printed_document_aura.cc b/printing/printed_document_aura.cc
index ca2aafb..2c204c0 100644
--- a/printing/printed_document_aura.cc
+++ b/printing/printed_document_aura.cc
@@ -8,7 +8,7 @@
namespace printing {
-#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX)
void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
PrintingContext* context) const {
// TODO(saintlou): This a stub to allow us to build under Aura.
diff --git a/printing/printing_context_aura.cc b/printing/printing_context_aura.cc
index 0d1320d..48c958b 100644
--- a/printing/printing_context_aura.cc
+++ b/printing/printing_context_aura.cc
@@ -8,7 +8,6 @@
namespace printing {
-#if !defined(OS_CHROMEOS)
// static
PrintingContext* PrintingContext::Create(const std::string& app_locale) {
// TODO(saintlou): This a stub to allow us to build under Aura.
@@ -16,6 +15,5 @@ PrintingContext* PrintingContext::Create(const std::string& app_locale) {
NOTIMPLEMENTED();
return NULL;
}
-#endif
} // namespace printing