Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2268)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/print_preview/print_preview.js

Issue 8227034: Change print setting conventions for margins to support more options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and a little cleanup Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/print_preview/margin_settings.js ('k') | chrome/renderer/print_web_view_helper.cc » ('j') | printing/print_job_constants.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview/print_preview.js
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index c3bfbca1d3229bee531b733ea9491a2bae44b190..90403e061de64985dc54d7d660266a8ed7c691c6 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.selectedMarginsAsString,
'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])) {
« no previous file with comments | « chrome/browser/resources/print_preview/margin_settings.js ('k') | chrome/renderer/print_web_view_helper.cc » ('j') | printing/print_job_constants.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698