More options for the types of margins to add.

chrome/renderer/print_web_view_helper.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/renderer/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 146 matching lines @@
   // too long.  This will be removed soon. http://crbug.com/92000
   settings->margin_top = 0;
   settings->margin_left = 0;
   settings->printable_size.set_width(settings->page_size.width());
   settings->printable_size.set_height(settings->page_size.height());
 }
 
 // Get the margins option selected and set custom margins appropriately.
 void SetCustomMarginsIfSelected(const DictionaryValue& job_settings,
                                 PrintMsg_PrintPages_Params* settings) {
-  bool default_margins_selected;
-  if (!job_settings.GetBoolean(printing::kSettingDefaultMarginsSelected,
-                               &default_margins_selected)) {
+  int margin_type = printing::DEFAULT_MARGINS;
+  if (!job_settings.GetInteger(printing::kSettingMarginsType, &margin_type)) {
     NOTREACHED();
-    default_margins_selected = true;
   }
 
-  if (default_margins_selected)
+  if (margin_type == printing::DEFAULT_MARGINS)
     return;
 
-  DictionaryValue* custom_margins;
-  if (!job_settings.GetDictionary(printing::kSettingMargins,
-                                  &custom_margins)) {
-    NOTREACHED();
-    return;
-  }
-
   double custom_margin_top_in_points = 0;
   double custom_margin_left_in_points = 0;
   double custom_margin_right_in_points = 0;
   double custom_margin_bottom_in_points = 0;
-  if (!custom_margins->GetDouble(printing::kSettingMarginTop,
-                                 &custom_margin_top_in_points) ||
-      !custom_margins->GetDouble(printing::kSettingMarginLeft,
-                                 &custom_margin_left_in_points) ||
-      !custom_margins->GetDouble(printing::kSettingMarginRight,
-                                 &custom_margin_right_in_points) ||
-      !custom_margins->GetDouble(printing::kSettingMarginBottom,
-                                 &custom_margin_bottom_in_points)) {
-    NOTREACHED();
-    return;
+  if (margin_type == printing::CUSTOM_MARGINS) {
+    DictionaryValue* custom_margins;
+    if (!job_settings.GetDictionary(printing::kSettingMarginsCustom,
+                                    &custom_margins)) {
+      NOTREACHED();
+      return;
+    }
+    if (!custom_margins->GetDouble(printing::kSettingMarginTop,
+                                   &custom_margin_top_in_points) ||
+        !custom_margins->GetDouble(printing::kSettingMarginLeft,
+                                   &custom_margin_left_in_points) ||
+        !custom_margins->GetDouble(printing::kSettingMarginRight,
+                                   &custom_margin_right_in_points) ||
+        !custom_margins->GetDouble(printing::kSettingMarginBottom,
+                                   &custom_margin_bottom_in_points)) {
+      NOTREACHED();
+      return;
+    }
   }
 
   int dpi = GetDPI(&settings->params);
   double custom_margin_top_in_dots = ConvertUnitDouble(
       custom_margin_top_in_points, printing::kPointsPerInch, dpi);
   double custom_margin_left_in_dots = ConvertUnitDouble(
       custom_margin_left_in_points, printing::kPointsPerInch, dpi);
   double custom_margin_right_in_dots = ConvertUnitDouble(
       custom_margin_right_in_points, printing::kPointsPerInch, dpi);
   double custom_margin_bottom_in_dots = ConvertUnitDouble(
@@ skipping 1380 matching lines @@
 PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
   error_ = PREVIEW_ERROR_NONE;
 }