diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 09:05:42 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 09:05:42 +0000 |
| commit | 6a7fdfd56a9b569a27c4e6937d26f058ea94cb63 (patch) | |
| tree | f5b9fb251070aab04217109820de8a3d82eae9ea /printing | |
| parent | 6ffcb08137cb8512ecc5f0c8eaf6e871b502263c (diff) | |
| download | chromium_src-6a7fdfd56a9b569a27c4e6937d26f058ea94cb63.zip chromium_src-6a7fdfd56a9b569a27c4e6937d26f058ea94cb63.tar.gz chromium_src-6a7fdfd56a9b569a27c4e6937d26f058ea94cb63.tar.bz2 | |
More options for the types of margins to add.
Original (broken) CL: http://codereview.chromium.org/8227034
Already approved by dpapad@
TBR=dpapad@chromium.org
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/8261005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/print_job_constants.cc | 12 | ||||
| -rw-r--r-- | printing/print_job_constants.h | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/printing/print_job_constants.cc b/printing/print_job_constants.cc index 5420e74..f07a460 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,12 @@ 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. Value is an int from the +// MarginType enum. +const char kSettingMarginsType[] = "marginsType"; // A page range. const char kSettingPageRange[] = "pageRange"; diff --git a/printing/print_job_constants.h b/printing/print_job_constants.h index 8b3c638..718a2b0 100644 --- a/printing/print_job_constants.h +++ b/printing/print_job_constants.h @@ -19,7 +19,6 @@ PRINTING_EXPORT extern const char kSettingColor[]; PRINTING_EXPORT extern const char kSettingContentHeight[]; PRINTING_EXPORT extern const char kSettingContentWidth[]; PRINTING_EXPORT extern const char kSettingCopies[]; -PRINTING_EXPORT extern const char kSettingDefaultMarginsSelected[]; PRINTING_EXPORT extern const char kSettingDeviceName[]; PRINTING_EXPORT extern const char kSettingDuplexMode[]; PRINTING_EXPORT extern const char kSettingGenerateDraftData[]; @@ -38,7 +37,8 @@ PRINTING_EXPORT extern const char kSettingMarginBottom[]; PRINTING_EXPORT extern const char kSettingMarginLeft[]; PRINTING_EXPORT extern const char kSettingMarginRight[]; PRINTING_EXPORT extern const char kSettingMarginTop[]; -PRINTING_EXPORT extern const char kSettingMargins[]; +PRINTING_EXPORT extern const char kSettingMarginsCustom[]; +PRINTING_EXPORT extern const char kSettingMarginsType[]; PRINTING_EXPORT extern const char kSettingPageRange[]; PRINTING_EXPORT extern const char kSettingPageRangeFrom[]; PRINTING_EXPORT extern const char kSettingPageRangeTo[]; @@ -112,6 +112,14 @@ enum ColorModels { PROCESSCOLORMODEL_RGB, // Used in canon printer ppds }; +// What kind of margins to use. +enum MarginType { + DEFAULT_MARGINS, // Default varies depending on headers being enabled or not + NO_MARGINS, + CUSTOM_MARGINS, + PRINTABLE_AREA_MARGINS, +}; + } // namespace printing #endif // PRINTING_PRINT_JOB_CONSTANTS_H_ |