Clean up cloud printing aura stub code.

BUG=102144
TEST=NONE


Review URL: http://codereview.chromium.org/8763007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113072 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 47 deletions

diff --git a/printing/image_cairo.cc b/printing/image_cairo.cc
deleted file mode 100644
index 694fd7d..0000000
--- a/printing/image_cairo.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "printing/image.h"
-
-#include "base/logging.h"
-
-namespace printing {
-
-bool Image::LoadMetafile(const Metafile& metafile) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-}  // namespace printing
diff --git a/printing/image_aura.cc b/printing/image_linux.cc
index 694fd7d..3968cfd 100644
--- a/printing/image_aura.cc
+++ b/printing/image_linux.cc
@@ -9,7 +9,6 @@
 namespace printing {
 
 bool Image::LoadMetafile(const Metafile& metafile) {
-  NOTIMPLEMENTED();
   return false;
 }
 
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 28a70e9..77771c4 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -230,4 +230,11 @@ PrintedDocument::Immutable::Immutable(const PrintSettings& settings,
 PrintedDocument::Immutable::~Immutable() {
 }
 
+#if defined(OS_POSIX) && defined(USE_AURA)
+// This function is not used on aura linux/chromeos.
+void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
+                                        PrintingContext* context) const {
+}
+#endif
+
 }  // namespace printing
diff --git a/printing/printed_document_aura.cc b/printing/printed_document_aura.cc
deleted file mode 100644
index 2c204c0..0000000
--- a/printing/printed_document_aura.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "printing/printed_document.h"
-
-#include "base/logging.h"
-
-namespace printing {
-
-#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.
-  // See issue: http://crbug.com/99282
-  NOTIMPLEMENTED();
-}
-#endif
-
-}  // namespace printing
diff --git a/printing/printed_document_cairo.cc b/printing/printed_document_gtk.cc
index 7a1fb32..7a1fb32 100644
--- a/printing/printed_document_cairo.cc
+++ b/printing/printed_document_gtk.cc
diff --git a/printing/printing.gyp b/printing/printing.gyp
index b5eb0e4..41d7793 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -35,8 +35,7 @@
         'emf_win.cc',
         'emf_win.h',
         'image.cc',
-        'image_aura.cc',
-        'image_cairo.cc',
+        'image_linux.cc',
         'image_mac.cc',
         'image_win.cc',
         'image.h',
@@ -56,8 +55,7 @@
         'pdf_metafile_cg_mac.h',
         'pdf_metafile_skia.h',
         'pdf_metafile_skia.cc',
-        'printed_document_aura.cc',
-        'printed_document_cairo.cc',
+        'printed_document_gtk.cc',
         'printed_document.cc',
         'printed_document.h',
         'printed_document_mac.cc',
@@ -127,12 +125,7 @@
         }],
         ['OS=="win"', {
           'conditions': [
-            ['use_aura==1', {
-              'sources!': [
-                'image_aura.cc',
-                'printed_document_aura.cc',
-              ],
-            }, {  #else: use_aura==0
+            ['use_aura==0', {
               'sources': [
                 'printing_context_win.cc',
                 'printing_context_win.h',