Move margin processing code to the browser process.

chrome/browser/printing/printing_message_filter.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/printing_message_filter.h"
 
 #include <string>
 
 #include "base/process_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 29 matching lines @@
 static base::LazyInstance<PrintingSequencePathMap>
     g_printing_file_descriptor_map(base::LINKER_INITIALIZED);
 #endif
 
 void RenderParamsFromPrintSettings(const printing::PrintSettings& settings,
                                    PrintMsg_Print_Params* params) {
   params->page_size = settings.page_setup_device_units().physical_size();
   params->printable_size.SetSize(
       settings.page_setup_device_units().content_area().width(),
       settings.page_setup_device_units().content_area().height());
-  params->margin_top = settings.page_setup_device_units().content_area().x();

[vandebo (ex-Chrome), 2011/10/08 01:27:24]

This is a long outstanding bug, that apparently hasn't mattered much.

-  params->margin_left = settings.page_setup_device_units().content_area().y();
+  params->margin_top = settings.page_setup_device_units().content_area().y();
+  params->margin_left = settings.page_setup_device_units().content_area().x();
   params->dpi = settings.dpi();
   // Currently hardcoded at 1.25. See PrintSettings' constructor.
   params->min_shrink = settings.min_shrink;
   // Currently hardcoded at 2.0. See PrintSettings' constructor.
   params->max_shrink = settings.max_shrink;
   // Currently hardcoded at 72dpi. See PrintSettings' constructor.
   params->desired_dpi = settings.desired_dpi;
   // Always use an invalid cookie.
   params->document_cookie = 0;
   params->selection_only = settings.selection_only;
@@ skipping 137 matching lines @@
       this,
       &PrintingMessageFilter::OnGetDefaultPrintSettingsReply,
       printer_query,
       reply_msg);
   // Loads default settings. This is asynchronous, only the IPC message sender
   // will hang until the settings are retrieved.
   printer_query->GetSettings(printing::PrinterQuery::DEFAULTS,
                              NULL,
                              0,
                              false,
-                             true,
+                             printing::DEFAULT_MARGINS,
                              task);
 }
 
 void PrintingMessageFilter::OnGetDefaultPrintSettingsReply(
     scoped_refptr<printing::PrinterQuery> printer_query,
     IPC::Message* reply_msg) {
   PrintMsg_Print_Params params;
   if (!printer_query.get() ||
       printer_query->last_status() != printing::PrintingContext::OK) {
     params.Reset();
@@ skipping 30 matching lines @@
       this,
       &PrintingMessageFilter::OnScriptedPrintReply,
       printer_query,
       params.routing_id,
       reply_msg);
 
   printer_query->GetSettings(printing::PrinterQuery::ASK_USER,
                              host_view,
                              params.expected_pages_count,
                              params.has_selection,
-                             params.use_overlays,
+                             params.margin_type,
                              task);
 }
 
 void PrintingMessageFilter::OnScriptedPrintReply(
     scoped_refptr<printing::PrinterQuery> printer_query,
     int routing_id,
     IPC::Message* reply_msg) {
   PrintMsg_PrintPages_Params params;
   if (printer_query->last_status() != printing::PrintingContext::OK ||
       !printer_query->settings().dpi()) {
@@ skipping 58 matching lines @@
   }
 }
 
 void PrintingMessageFilter::OnCheckForCancel(const std::string& preview_ui_addr,
                                              int preview_request_id,
                                              bool* cancel) {
   PrintPreviewUI::GetCurrentPrintPreviewStatus(preview_ui_addr,
                                                preview_request_id,
                                                cancel);
 }