Connect the right metafiles for print preview on Linux and Windows.

+ Remove the NativeMetafileFactory since we can't just use preview flag.
+ Update each Metafile constructor site to use PreviewMetafile or NativeMetafileImpl.
+ Fix misc. problems blocking pdf generation on Windows.
+ Rename the metafile interface.

BUG=NONE
TEST=NONE

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

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

1 files changed, 5 insertions, 10 deletions

diff --git a/printing/pdf_metafile_skia.h b/printing/pdf_metafile_skia.h
index 4e8a003..515c3a8 100644
--- a/printing/pdf_metafile_skia.h
+++ b/printing/pdf_metafile_skia.h
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
-#include "printing/native_metafile.h"
+#include "printing/metafile.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -20,11 +20,12 @@ namespace printing {
 struct PdfMetafileSkiaData;
 
 // This class uses Skia graphics library to generate a PDF document.
-class PdfMetafileSkia : public NativeMetafile {
+class PdfMetafileSkia : public Metafile {
  public:
+  PdfMetafileSkia();
   virtual ~PdfMetafileSkia();
 
-  // NativeMetafile interface
+  // Metafile methods.
   virtual bool Init();
   virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size);
 
@@ -55,15 +56,9 @@ class PdfMetafileSkia : public NativeMetafile {
 #endif  // if defined(OS_WIN)
 
 #if defined(OS_CHROMEOS)
-  virtual bool SaveToFD(const base::FileDescriptor& fd) const = 0;
+  virtual bool SaveToFD(const base::FileDescriptor& fd) const;
 #endif  // if defined(OS_CHROMEOS)
-
- protected:
-  PdfMetafileSkia();
-
  private:
-  friend class NativeMetafileFactory;
-
   scoped_ptr<PdfMetafileSkiaData> data_;
 
   DISALLOW_COPY_AND_ASSIGN(PdfMetafileSkia);