summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/print_preview/print_preview.js
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 09:05:42 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 09:05:42 +0000
commit6a7fdfd56a9b569a27c4e6937d26f058ea94cb63 (patch)
treef5b9fb251070aab04217109820de8a3d82eae9ea /chrome/browser/resources/print_preview/print_preview.js
parent6ffcb08137cb8512ecc5f0c8eaf6e871b502263c (diff)
downloadchromium_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 'chrome/browser/resources/print_preview/print_preview.js')
-rw-r--r--chrome/browser/resources/print_preview/print_preview.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index 13fde31d..5378744 100644
--- a/chrome/browser/resources/print_preview/print_preview.js
+++ b/chrome/browser/resources/print_preview/print_preview.js
@@ -355,11 +355,13 @@ function getSettings() {
'printWithCloudPrint': printWithCloudPrint,
'isFirstRequest' : false,
'headerFooterEnabled': headerFooterSettings.hasHeaderFooter(),
- 'defaultMarginsSelected': marginSettings.isDefaultMarginsSelected(),
- 'margins': marginSettings.customMargins,
+ 'marginsType': marginSettings.selectedMarginsValue,
'requestID': -1,
'generateDraftData': generateDraftData};
+ if (marginSettings.isCustomMarginsSelected())
+ settings['marginsCustom'] = marginSettings.customMargins;
+
var printerList = $('printer-list');
var selectedPrinter = printerList.selectedIndex;
if (cloudprint.isCloudPrint(printerList.options[selectedPrinter])) {