Change print setting conventions for margins to support more options.

chrome/browser/resources/print_preview/margin_settings.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.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * Creates a Margins object that holds four margin values. The units in which
    * the values are expressed can be any numeric value.
@@ skipping 154 matching lines @@
       var margins = {};
       margins.marginLeft = this.customMargins_.left;
       margins.marginTop = this.customMargins_.top;
       margins.marginRight = this.customMargins_.right;
       margins.marginBottom = this.customMargins_.bottom;
       return margins;
     },
 
     /**
      * @return {number} The value of the selected margin option.
-     * @private
      */
-    get selectedMarginsValue_() {
-      return this.marginList_.options[this.marginList_.selectedIndex].value;
+    get selectedMarginsValue() {
+      var val = this.marginList_.options[this.marginList_.selectedIndex].value;
+      return parseInt(val, 10);
     },
 
     /**
      * @return {boolean} True if default margins are selected.
      */
     isDefaultMarginsSelected: function() {
-      return this.selectedMarginsValue_ == MarginSettings.MARGINS_VALUE_DEFAULT;
+      return this.selectedMarginsValue == MarginSettings.MARGINS_VALUE_DEFAULT;
     },
 
     /**
      * @return {boolean} True if no margins are selected.
      */
     isNoMarginsSelected: function() {
-      return this.selectedMarginsValue_ ==
+      return this.selectedMarginsValue ==
           MarginSettings.MARGINS_VALUE_NO_MARGINS;
     },
 
     /**
      * @return {boolean} True if custom margins are selected.
      */
     isCustomMarginsSelected: function() {
-      return this.selectedMarginsValue_ == MarginSettings.MARGINS_VALUE_CUSTOM;
+      return this.selectedMarginsValue == MarginSettings.MARGINS_VALUE_CUSTOM;
     },
 
     /**
      * If the custom margin values have changed then request a new preview based
      * on the newly set margins.
      * @private
      */
     requestPreviewIfNeeded_: function() {
       if (!this.areMarginSettingsValid())
         return;
@@ skipping 142 matching lines @@
      * @private
      */
     onMarginsChanged_: function() {
       if (this.isDefaultMarginsSelected())
         this.onDefaultMarginsSelected_();
       else if (this.isNoMarginsSelected())
         this.onNoMarginsSelected_();
       else if (this.isCustomMarginsSelected())
         this.onCustomMarginsSelected_();
 
-      this.lastSelectedOption_ = this.selectedMarginsValue_;
+      this.lastSelectedOption_ = this.selectedMarginsValue;
     },
 
     /**
      * Executes when the default margins option is selected.
      * @private
      */
     onDefaultMarginsSelected_: function() {
       this.removeCustomMarginEventListeners_();
       this.forceDisplayingMarginLines_ = true;
       setDefaultValuesAndRegeneratePreview(false);
@@ skipping 92 matching lines @@
       if (!previewModifiable)
         fadeOutElement(this.marginsOption_);
     }
   };
 
   return {
     MarginSettings: MarginSettings,
     PageLayout: PageLayout,
   };
 });