Print Preview: Making margin selection sticky (part 2/2)

printing/printing_context.cc

Index: printing/printing_context.cc
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
index cc39e6c0e0937cd7e4986842451cb8f69c868c8b..d3ea2c8c8a60183c8ee24656c9651a2cc627949d 100644
--- a/printing/printing_context.cc
+++ b/printing/printing_context.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/values.h"
 #include "printing/page_setup.h"
+#include "printing/page_size_margins.h"
 #include "printing/print_settings_initializer.h"
 
 namespace printing {
@@ -62,27 +63,15 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings(
   settings_.margin_type = static_cast<MarginType>(margin_type);
 
   if (margin_type == CUSTOM_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(kSettingMarginsCustom, &custom_margins) ||
-        !custom_margins->GetDouble(kSettingMarginTop, &top_margin_in_points) ||
-        !custom_margins->GetDouble(kSettingMarginBottom,
-                                   &bottom_margin_in_points) ||
-        !custom_margins->GetDouble(kSettingMarginLeft,
-                                   &left_margin_in_points) ||
-        !custom_margins->GetDouble(kSettingMarginRight,
-                                   &right_margin_in_points)) {
-      NOTREACHED();
-    }
+    printing::PageSizeMargins page_size_margins;

[kmadhusu, 2011/11/02 20:40:05]

PageSizeMargins object is not required here. You are actually fetching the page
margins. Can you use PageMargins directly?

extractMarginValues(job_settings, &margins_in_points);

[dpapad, 2011/11/02 21:33:57]

I am fetching it this way so that I can reuse extractPageSizeMargins. Reusing it
was the reason for adding it in the first place.

+    extractPageSizeMargins(job_settings, &page_size_margins);
+
     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;
+    margins_in_points.top = page_size_margins.margin_top;
+    margins_in_points.bottom = page_size_margins.margin_bottom;
+    margins_in_points.left = page_size_margins.margin_left;
+    margins_in_points.right = page_size_margins.margin_right;
 
     settings_.SetCustomMargins(margins_in_points);
   }