Change print setting conventions for margins to support more options.

printing/print_job_constants.cc

Index: printing/print_job_constants.cc
diff --git a/printing/print_job_constants.cc b/printing/print_job_constants.cc
index 3efb488044e9a9b1334085f88401a059ab2aa7ba..6a1057343991cfeb6a0301d5e391d665da16841e 100644
--- a/printing/print_job_constants.cc
+++ b/printing/print_job_constants.cc
@@ -36,10 +36,6 @@ 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";
 
@@ -99,8 +95,23 @@ 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";