Move margin processing code to the browser process.

printing/printing_context.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 "printing/printing_context.h"
 
 #include "base/values.h"
+#include "printing/page_setup.h"
 #include "printing/print_settings_initializer.h"
 
 namespace printing {
 
 PrintingContext::PrintingContext(const std::string& app_locale)
     : dialog_box_dismissed_(false),
       in_print_job_(false),
       abort_printing_(false),
       app_locale_(app_locale) {
 }
@@ skipping 12 matching lines @@
 }
 
 PrintingContext::Result PrintingContext::OnError() {
   ResetSettings();
   return abort_printing_ ? CANCEL : FAILED;
 }
 
 PrintingContext::Result PrintingContext::UpdatePrintSettings(
     const base::DictionaryValue& job_settings,
     const PageRanges& ranges) {
+  ResetSettings();

[Lei Zhang, 2011/10/08 02:02:05]

I see you removed a ResetSettings() call in printing_context_win.cc. Is that
really moving it here. I don't know off the top of my head if this is right.

[vandebo (ex-Chrome), 2011/10/15 00:42:50]

The previous ResetSettings happened after I set these settings, so yes I moved
it up in the flow.  Linux used to fill out a stack local copy and then copy it
in instead of doing Reset.

+  if (!job_settings.GetBoolean(printing::kSettingHeaderFooterEnabled,

[Lei Zhang, 2011/10/08 02:02:05]

this block is not needed. It's already in
PrintSettingsInitializer::InitHeaderFooterStrings.

[vandebo (ex-Chrome), 2011/10/15 00:42:50]

The value needs to be set for PrintSettings::SetPrinterPrintableAream which is
called from UpdatePrinterSettings, but I can't just swap the order of it and
InitHeaderFooterStrings because that depends on settings set in
UpdatePrinterSettings.  I could remove it from InitHeaderFooterStrings, but
leaving it in makes that method seem more complete.

+                               &settings_.display_header_footer)) {
+    NOTREACHED();
+  }
+  bool default_margins;
+  if (!job_settings.GetBoolean(printing::kSettingDefaultMarginsSelected,
+                               &default_margins)) {
+    NOTREACHED();
+    default_margins = true;
+  }
+  if (!default_margins) {
+    double top_margin_in_points = 0;
+    double bottom_margin_in_points = 0;
+    double left_margin_in_points = 0;
+    double right_margin_in_points = 0;
+    DictionaryValue* custom_margins;
+    if (!job_settings.GetDictionary(printing::kSettingMargins,
+                                    &custom_margins) ||
+        !custom_margins->GetDouble(printing::kSettingMarginTop,
+                                   &top_margin_in_points) ||
+        !custom_margins->GetDouble(printing::kSettingMarginBottom,
+                                   &bottom_margin_in_points) ||
+        !custom_margins->GetDouble(printing::kSettingMarginLeft,
+                                   &left_margin_in_points) ||
+        !custom_margins->GetDouble(printing::kSettingMarginRight,
+                                   &right_margin_in_points)) {
+      NOTREACHED();
+    }
+    PageMargins margins_in_points;
+    margins_in_points.Clear();
+    margins_in_points.top = top_margin_in_points;
+    margins_in_points.bottom = bottom_margin_in_points;
+    margins_in_points.left = left_margin_in_points;
+    margins_in_points.right = right_margin_in_points;
+
+    PageMargins empty;
+    empty.Clear();

[Lei Zhang, 2011/10/08 02:02:05]

Not needed. Better yet, let's add an is_empty method to PageMargins?

[vandebo (ex-Chrome), 2011/10/15 00:42:50]

Fixed otherwise.

+    if (margins_in_points.Equals(empty)) {
+      settings_.margin_type = NO_MARGINS;
+    } else {
+      settings_.SetCustomMargins(margins_in_points);
+    }
+  }
+
   PrintingContext::Result result = UpdatePrinterSettings(job_settings, ranges);
   printing::PrintSettingsInitializer::InitHeaderFooterStrings(job_settings,
                                                               &settings_);
   return result;
 }
 
 }  // namespace printing