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

chrome/browser/printing/print_view_manager.cc

 // 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 "chrome/browser/printing/print_view_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/print_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
-#include "printing/native_metafile.h"
-#include "printing/native_metafile_factory.h"
+#include "printing/metafile.h"
+#include "printing/metafile_impl.h"

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

you probably don't need both. metafile_impl.h will likely always include
metafile.h.

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

I agree that in this case we probably only need metafile_impl.h, but is there a
style rule that allows that violation of include what you use?  This file does
explicitly use the interface in metafile.h

 #include "printing/printed_document.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::TimeDelta;
 
 namespace {
 
 string16 GenerateRenderSourceName(TabContents* tab_contents) {
   string16 name(tab_contents->GetTitle());
   if (name.empty())
@@ skipping 105 matching lines @@
 
   base::SharedMemory shared_buf(params.metafile_data_handle, true);
   if (metafile_must_be_valid) {
     if (!shared_buf.Map(params.data_size)) {
       NOTREACHED() << "couldn't map";
       tab_contents()->Stop();
       return;
     }
   }
 
-  scoped_ptr<NativeMetafile> metafile;
+  scoped_ptr<Metafile> metafile(new printing::NativeMetafile);
   if (metafile_must_be_valid) {
-    metafile.reset(NativeMetafileFactory::CreateFromData(shared_buf.memory(),
-                                                         params.data_size));
+    metafile->InitFromData(shared_buf.memory(), params.data_size);

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

Need to check return value, and remove the if check below since it no longer
makes sense.

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

Done.

     if (!metafile.get()) {
       NOTREACHED() << "Invalid metafile header";
       tab_contents()->Stop();
       return;
     }
   }
 
   // Update the rendered document. It will send notifications to the listener.
   document->SetPage(params.page_number,
                     metafile.release(),
@@ skipping 285 matching lines @@
     return false;
   }
 
   // Settings are already loaded. Go ahead. This will set
   // print_job_->is_job_pending() to true.
   print_job_->StartPrinting();
   return true;
 }
 
 }  // namespace printing