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

printing/image.h

Index: printing/image.h
diff --git a/printing/image.h b/printing/image.h
index 5d84c8d654330a26449e8c6a66b08f3e52cedc7c..31a4cf8e99a0219cf65a3d622c083e9593660762 100644
--- a/printing/image.h
+++ b/printing/image.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "printing/native_metafile.h"
+#include "printing/metafile.h"

[Lei Zhang, 2011/04/11 02:51:10]

forward declare instead?

[vandebo (ex-Chrome), 2011/04/11 06:16:08]

Done.

 #include "ui/gfx/size.h"
 
 class FilePath;
@@ -28,7 +28,7 @@ class Image {
 
   // Creates the image from the metafile.  Deduces bounds based on bounds in
   // metafile.  If loading fails size().IsEmpty() will be true.
-  explicit Image(const NativeMetafile& metafile);
+  explicit Image(const Metafile& metafile);
 
   // Copy constructor.
   explicit Image(const Image& image);
@@ -73,7 +73,7 @@ class Image {
 
   bool LoadMetafile(const std::string& data);
 
-  bool LoadMetafile(const NativeMetafile& metafile);
+  bool LoadMetafile(const Metafile& metafile);
 
   // Pixel dimensions of the image.
   gfx::Size size_;