Print Preview: Making margin selection sticky (part 2/2)

chrome/browser/resources/print_preview/print_preview.js

 // 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.
 
 // require: cr/ui/print_preview_cloud.js
 
 var localStrings = new LocalStrings();
 
 // If useCloudPrint is true we attempt to connect to cloud print
 // and populate the list of printers with cloud print printers.
@@ skipping 146 matching lines @@
   pageSettings = print_preview.PageSettings.getInstance();
   copiesSettings = print_preview.CopiesSettings.getInstance();
   layoutSettings = print_preview.LayoutSettings.getInstance();
   marginSettings = print_preview.MarginSettings.getInstance();
   headerFooterSettings = print_preview.HeaderFooterSettings.getInstance();
   colorSettings = print_preview.ColorSettings.getInstance();
   $('printer-list').onchange = updateControlsWithSelectedPrinterCapabilities;
 
   previewArea.showLoadingAnimation();
   chrome.send('getInitiatorTabTitle');
-  chrome.send('getDefaultPrinter');
+  serializeRequests();
   chrome.send('getNumberFormatAndMeasurementSystem');
 }
 
 /**
+ * Serializes requests |getNumberFormatAndMeasurementSystem|,
+ * |getLastUsedMarginSettings| and |getDefaultPrinter|. It guarantees that
+ * responses to those requests will arrive in the order requested.
+ */
+function serializeRequests() {

[kmadhusu, 2011/11/03 17:35:38]

If the source is pdf, we will not display margin settings. You don't need to
send getNumberFormatAndMeasurementSystem and getLastUsedMarginSettings messages.

[vandebo (ex-Chrome), 2011/11/03 18:07:27]

serializeRequests is a pretty generic name...  Maybe setupInitialRequests?

+  var oldSetNumberFormatAndMeasurementSystem =
+      print_preview.setNumberFormatAndMeasurementSystem;
+  print_preview.setNumberFormatAndMeasurementSystem =
+      function(numberFormat, measurementSystem) {
+        oldSetNumberFormatAndMeasurementSystem(numberFormat, measurementSystem);
+        chrome.send('getLastUsedMarginSettings');
+      };
+  var oldSetLastUsedMargins =
+      print_preview.setLastUsedMargins.bind(marginSettings);
+  print_preview.setLastUsedMargins = function (
+      lastUsedMarginType, lastUsedMargins) {
+    oldSetLastUsedMargins(lastUsedMarginType, lastUsedMargins);
+    chrome.send('getDefaultPrinter');
+  };
+}
+
+/**
  * Disables the input elements in the sidebar.
  */
 function disableInputElementsInSidebar() {
   var els = $('sidebar').querySelectorAll('input, button, select');
   for (var i = 0; i < els.length; i++) {
     if (els[i] == printHeader.cancelButton)
       continue;
     els[i].disabled = true;
   }
 }
@@ skipping 94 matching lines @@
       sendPrintDocumentRequest();
   } else {
     // This message will call back to 'updateWithPrinterCapabilities'
     // function.
     chrome.send('getPrinterCapabilities', [selectedValue]);
   }
   if (!skip_refresh) {
     lastSelectedPrinterIndex = selectedIndex;
 
     // Regenerate the preview data based on selected printer settings.
-    setDefaultValuesAndRegeneratePreview(true);
+    setDefaultValuesAndRegeneratePreview(false);
   }
 }
 
 /**
  * Helper function to do the actual work of updating cloud printer
  * capabilities.
  * @param {Object} printer The printer object to set capabilities for.
  */
 function doUpdateCloudPrinterCapabilities(printer) {
   var settings = {'disableColorOption': !cloudprint.supportsColor(printer),
                   'setColorAsDefault': cloudprint.colorIsDefault(printer),
                   'disableCopiesOption': true,
                   'disableLandscapeOption': true};
   updateWithPrinterCapabilities(settings);
   var printerList = $('printer-list');
   var selectedIndex = printerList.selectedIndex;
   lastSelectedPrinterIndex = selectedIndex;
 
   // Regenerate the preview data based on selected printer settings.
-  setDefaultValuesAndRegeneratePreview(true);
+  setDefaultValuesAndRegeneratePreview(false);
 }
 
 /**
  * Notifies listeners of |customEvents.PRINTER_CAPABILITIES_UPDATED| about the
  * capabilities of the currently selected printer. It is called from C++ too.
  * @param {Object} settingInfo printer setting information.
  */
 function updateWithPrinterCapabilities(settingInfo) {
   var customEvent = new cr.Event(customEvents.PRINTER_CAPABILITIES_UPDATED);
   customEvent.printerCapabilities = settingInfo;
@@ skipping 253 matching lines @@
   disableInputElementsInSidebar();
   previewArea.showCustomMessage(
       localStrings.getString('printingToPDFInProgress'));
 }
 
 /**
  * Set the default printer. If there is one, generate a print preview.
  * @param {string} printer Name of the default printer. Empty if none.
  * @param {string} cloudPrintData Cloud print related data to restore if
  *     the default printer is a cloud printer.
- * @param {number} lastUsedMarginsType Indicates the last used margins type
- *     (matches enum MarginType in printing/print_job_constants.h.
  */
-function setDefaultPrinter(printer_name, cloudPrintData, lastUsedMarginsType) {
-  // Setting the margin selection to the last used one.
-  marginSettings.setLastUsedMarginsType(lastUsedMarginsType);
+function setDefaultPrinter(printer_name, cloudPrintData) {
   // Add a placeholder value so the printer list looks valid.
   addDestinationListOption('', '', true, true, true);
   if (printer_name) {
     defaultOrLastUsedPrinterName = printer_name;
     if (cloudPrintData) {
       cloudprint.setDefaultPrinter(printer_name,
                                    cloudPrintData,
                                    addDestinationListOptionAtPosition,
                                    doUpdateCloudPrinterCapabilities);
     } else {
@@ skipping 503 matching lines @@
 <include src="copies_settings.js"/>
 <include src="header_footer_settings.js"/>
 <include src="layout_settings.js"/>
 <include src="color_settings.js"/>
 <include src="margin_settings.js"/>
 <include src="margin_textbox.js"/>
 <include src="margin_utils.js"/>
 <include src="margins_ui.js"/>
 <include src="margins_ui_pair.js"/>
 <include src="preview_area.js"/>