Change print setting conventions for margins to support more options.

printing/print_job_constants.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/print_job_constants.h"
 
 namespace printing {
 
 // True if this is the first preview request.
 const char kIsFirstRequest[] = "isFirstRequest";
@@ skipping 18 matching lines @@
 
 // Key that specifies the height of the content area of the page.
 const char kSettingContentHeight[] = "contentHeight";
 
 // Key that specifies the width of the content area of the page.
 const char kSettingContentWidth[] = "contentWidth";
 
 // Number of copies.
 const char kSettingCopies[] = "copies";
 
-// Key that specifies if the default margins have been selected or not.
-// True if selected, false if not.
-const char kSettingDefaultMarginsSelected[] = "defaultMarginsSelected";
-
 // Device name: Unique printer identifier.
 const char kSettingDeviceName[] = "deviceName";
 
 // Print job duplex mode.
 const char kSettingDuplexMode[] = "duplex";
 
 // True, when a new set of draft preview data is required.
 const char kSettingGenerateDraftData[] = "generateDraftData";
 
 // Option to print headers and Footers: true if selected, false if not.
@@ skipping 39 matching lines @@
 
 // Key that specifies the left margin of the page.
 const char kSettingMarginLeft[] = "marginLeft";
 
 // Key that specifies the right margin of the page.
 const char kSettingMarginRight[] = "marginRight";
 
 // Key that specifies the top margin of the page.
 const char kSettingMarginTop[] = "marginTop";
 
-// Key that specifies the array of custom margins as set by the user.
-const char kSettingMargins[] = "margins";
+// Key that specifies the dictionary of custom margins as set by the user.
+const char kSettingMarginsCustom[] = "marginsCustom";
+
+// Key that specifies the type of margins to use.
+const char kSettingMarginsType[] = "marginsType";
+
+// Value for kSettingMarginsType specifying custom margins.
+const char kSettingMarginsTypeCustom[] = "customMargins";

[dpapad, 2011/10/12 18:04:22]

Do kSettingsMarginsType{Custom|None|Default} have to be strings? Asking because
otherwise you could use the existing method
marginSettings.selectedMarginsValue_, which returns an int depending on the
selected margins type and there would be no need for selectedMarginsAsString().

[vandebo (ex-Chrome), 2011/10/12 20:50:04]

Nope, changed to an int (taken from an enum, which I was going to introduce in
the next CL anyway).

+
+// Value for kSettingMarginsType specifying default margins.
+const char kSettingMarginsTypeDefault[] = "defaultMargins";
+
+// Value for kSettingMarginsType specifying no margins.
+const char kSettingMarginsTypeNone[] = "noMargins";
+
+// Value for kSettingMarginsType specifying margins set to the printable area.
+const char kSettingMarginsTypePrintableArea[] = "printableAreaMargins";
 
 // A page range.
 const char kSettingPageRange[] = "pageRange";
 
 // The first page of a page range. (1-based)
 const char kSettingPageRangeFrom[] = "from";
 
 // The last page of a page range. (1-based)
 const char kSettingPageRangeTo[] = "to";
 
 // Printer name.
 const char kSettingPrinterName[] = "printerName";
 
 // Print to PDF option: true if selected, false if not.
 const char kSettingPrintToPDF[] = "printToPDF";
 
 // Indices used to represent first preview page and complete preview document.
 const int FIRST_PAGE_INDEX = 0;
 const int COMPLETE_PREVIEW_DOCUMENT_INDEX = -1;
 
 }  // namespace printing