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, 5 deletions

diff --git a/printing/printed_page.cc b/printing/printed_page.cc
index 1661813..ac1a2d8 100644
--- a/printing/printed_page.cc
+++ b/printing/printed_page.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,12 +7,12 @@
 namespace printing {
 
 PrintedPage::PrintedPage(int page_number,
-                         NativeMetafile* native_metafile,
+                         Metafile* metafile,
                          const gfx::Size& page_size,
                          const gfx::Rect& page_content_rect,
                          bool has_visible_overlays)
     : page_number_(page_number),
-      native_metafile_(native_metafile),
+      metafile_(metafile),
       page_size_(page_size),
       page_content_rect_(page_content_rect),
       has_visible_overlays_(has_visible_overlays) {
@@ -21,8 +21,8 @@ PrintedPage::PrintedPage(int page_number,
 PrintedPage::~PrintedPage() {
 }
 
-const NativeMetafile* PrintedPage::native_metafile() const {
-  return native_metafile_.get();
+const Metafile* PrintedPage::metafile() const {
+  return metafile_.get();
 }
 
 void PrintedPage::GetCenteredPageContentRect(