Print Preview: Rename MarginsTypeValue->MarginsType

There's no reason for the longer name, and we want to be consistent
when we add ScalingType in a future CL.

Change-Id: Ieeb4e00fb9faeea03a6b82ac46627d175b181e54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832471Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701430}

chrome/browser/resources/print_preview/data/margins.js

@@ -21,7 +21,7 @@ cr.define('print_preview', function() {
    * printing/print_job_constants.h.
    * @enum {number}
    */
-  const MarginsTypeValue = {
+  const MarginsType = {
     DEFAULT: 0,
     NO_MARGINS: 1,
     MINIMUM: 2,
@@ -30,7 +30,7 @@ cr.define('print_preview', function() {
 
   return {
     CustomMarginsOrientation: CustomMarginsOrientation,
-    MarginsTypeValue: MarginsTypeValue,
+    MarginsType: MarginsType,
   };
 });
 

chrome/browser/resources/print_preview/data/model.js

@@ -60,7 +60,7 @@ cr.define('print_preview', function() {
    *                 width_microns: number,
    *                 custom_display_name: (string | undefined),
    *                 is_default: (boolean | undefined)} | undefined),
-   *    marginsType: (print_preview.MarginsTypeValue | undefined),
+   *    marginsType: (print_preview.MarginsType | undefined),
    *    customMargins: (print_preview.MarginsSetting | undefined),
    *    isColorEnabled: (boolean | undefined),
    *    isDuplexEnabled: (boolean | undefined),
@@ -262,8 +262,8 @@ Polymer({
             updatesPreview: true,
           },
           margins: {
-            value: print_preview.MarginsTypeValue.DEFAULT,
-            unavailableValue: print_preview.MarginsTypeValue.DEFAULT,
+            value: print_preview.MarginsType.DEFAULT,
+            unavailableValue: print_preview.MarginsType.DEFAULT,
             valid: true,
             available: true,
             setByPolicy: false,
@@ -790,20 +790,20 @@ Polymer({
     // Otherwise, availability depends on the margins.
     let available = false;
     const marginsType =
-        /** @type {!print_preview.MarginsTypeValue} */ (
+        /** @type {!print_preview.MarginsType} */ (
             this.getSettingValue('margins'));
     switch (marginsType) {
-      case print_preview.MarginsTypeValue.DEFAULT:
+      case print_preview.MarginsType.DEFAULT:
         available = !this.margins ||
             this.margins.get(print_preview.CustomMarginsOrientation.TOP) > 0 ||
             this.margins.get(print_preview.CustomMarginsOrientation.BOTTOM) > 0;
         break;
-      case print_preview.MarginsTypeValue.NO_MARGINS:
+      case print_preview.MarginsType.NO_MARGINS:
         break;
-      case print_preview.MarginsTypeValue.MINIMUM:
+      case print_preview.MarginsType.MINIMUM:
         available = true;
         break;
-      case print_preview.MarginsTypeValue.CUSTOM:
+      case print_preview.MarginsType.CUSTOM:
         const margins = this.getSettingValue('customMargins');
         available = margins.marginTop > 0 || margins.marginBottom > 0;
         break;
@@ -1236,8 +1236,7 @@ Polymer({
       ticket.cloudPrintID = destination.id;
     }
 
-    if (this.getSettingValue('margins') ==
-        print_preview.MarginsTypeValue.CUSTOM) {
+    if (this.getSettingValue('margins') == print_preview.MarginsType.CUSTOM) {
       ticket.marginsCustom = this.getSettingValue('customMargins');
     }
 

chrome/browser/resources/print_preview/ui/margin_control_container.js

@@ -136,8 +136,7 @@ cr.define('print_preview', function() {
      */
     computeAvailable_: function() {
       return this.previewLoaded && !!this.clipSize_ &&
-          this.getSettingValue('margins') ==
-          print_preview.MarginsTypeValue.CUSTOM &&
+          this.getSettingValue('margins') == print_preview.MarginsType.CUSTOM &&
           !!this.pageSize;
     },
 
@@ -185,9 +184,9 @@ cr.define('print_preview', function() {
 
       this.resetMargins_ = true;
       const marginsSetting = this.getSetting('margins');
-      if (marginsSetting.value == print_preview.MarginsTypeValue.CUSTOM) {
+      if (marginsSetting.value == print_preview.MarginsType.CUSTOM) {
         // Set the margins value to default first.
-        this.setSetting('margins', print_preview.MarginsTypeValue.DEFAULT);
+        this.setSetting('margins', print_preview.MarginsType.DEFAULT);
       }
       // Reset custom margins so that the sticky value is not restored for the
       // new paper size.

chrome/browser/resources/print_preview/ui/margins_settings.html

@@ -19,15 +19,19 @@
                              settings.pagesPerSheet.value)]]"
             value="{{selectedValue::change}}">
           <!-- The order of these options must match the natural order of their
-          values, which come from print_preview.MarginsTypeValue. -->
-          <option value="[[MarginsValue.DEFAULT]]" selected>
+          values, which come from print_preview.MarginsType. -->
+          <option value="[[MarginsTypeEnum.DEFAULT]]" selected>
             $i18n{defaultMargins}
           </option>
-          <option value="[[MarginsValue.NO_MARGINS]]">$i18n{noMargins}</option>
-          <option value="[[MarginsValue.MINIMUM]]">
+          <option value="[[MarginsTypeEnum.NO_MARGINS]]">
+            $i18n{noMargins}
+          </option>
+          <option value="[[MarginsTypeEnum.MINIMUM]]">
             $i18n{minimumMargins}
           </option>
-          <option value="[[MarginsValue.CUSTOM]]">$i18n{customMargins}</option>
+          <option value="[[MarginsTypeEnum.CUSTOM]]">
+            $i18n{customMargins}
+          </option>
         </select>
       </div>
     </print-preview-settings-section>

chrome/browser/resources/print_preview/ui/margins_settings.js

@@ -11,14 +11,14 @@ Polymer({
     disabled: Boolean,
 
     /** Mirroring the enum so that it can be used from HTML bindings. */
-    MarginsValue: Object,
+    MarginsTypeEnum: Object,
   },
 
   observers: ['onMarginsSettingChange_(settings.margins.value)'],
 
   /** @override */
   ready: function() {
-    this.MarginsValue = print_preview.MarginsTypeValue;
+    this.MarginsTypeEnum = print_preview.MarginsType;
   },
 
   /**
@@ -27,7 +27,7 @@ Polymer({
    */
   onMarginsSettingChange_: function(newValue) {
     this.selectedValue =
-        /** @type {!print_preview.MarginsTypeValue} */ (newValue).toString();
+        /** @type {!print_preview.MarginsType} */ (newValue).toString();
   },
 
   /** @param {string} value The new select value. */

chrome/browser/resources/print_preview/ui/pages_per_sheet_settings.js

@@ -19,7 +19,7 @@ Polymer({
    */
   onPagesPerSheetSettingChange_: function(newValue) {
     this.selectedValue = /** @type {number} */ (newValue).toString();
-    this.setSetting('margins', print_preview.MarginsTypeValue.DEFAULT);
+    this.setSetting('margins', print_preview.MarginsType.DEFAULT);
   },
 
   /** @param {string} value The new select value. */

chrome/browser/resources/print_preview/ui/preview_area.js

@@ -529,12 +529,12 @@ Polymer({
    */
   marginsValid_: function() {
     const type = this.getSettingValue('margins');
-    if (!Object.values(print_preview.MarginsTypeValue).includes(type)) {
+    if (!Object.values(print_preview.MarginsType).includes(type)) {
       // Unrecognized margins type.
       return false;
     }
 
-    if (type !== print_preview.MarginsTypeValue.CUSTOM) {
+    if (type !== print_preview.MarginsType.CUSTOM) {
       return true;
     }
 
@@ -566,11 +566,11 @@ Polymer({
     // Margins
     const newMarginsType = this.getSettingValue('margins');
     if (newMarginsType !== lastTicket.marginsType &&
-        newMarginsType !== print_preview.MarginsTypeValue.CUSTOM) {
+        newMarginsType !== print_preview.MarginsType.CUSTOM) {
       return true;
     }
 
-    if (newMarginsType === print_preview.MarginsTypeValue.CUSTOM) {
+    if (newMarginsType === print_preview.MarginsType.CUSTOM) {
       const customMargins =
           /** @type {!print_preview.MarginsSetting} */ (
               this.getSettingValue('customMargins'));
@@ -626,8 +626,7 @@ Polymer({
     // Pages per sheet. If margins are non-default, wait for the return to
     // default margins to trigger a request.
     if (this.getSettingValue('pagesPerSheet') !== lastTicket.pagesPerSheet &&
-        this.getSettingValue('margins') ===
-            print_preview.MarginsTypeValue.DEFAULT) {
+        this.getSettingValue('margins') === print_preview.MarginsType.DEFAULT) {
       return true;
     }
 
@@ -639,7 +638,7 @@ Polymer({
         newValue.width_microns != lastTicket.mediaSize.width_microns ||
         (this.destination.id !== lastTicket.deviceName &&
          this.getSettingValue('margins') ===
-             print_preview.MarginsTypeValue.MINIMUM)) {
+             print_preview.MarginsType.MINIMUM)) {
       return true;
     }
 
@@ -731,8 +730,7 @@ Polymer({
       ticket.cloudPrintID = this.destination.id;
     }
 
-    if (this.getSettingValue('margins') ==
-        print_preview.MarginsTypeValue.CUSTOM) {
+    if (this.getSettingValue('margins') == print_preview.MarginsType.CUSTOM) {
       ticket.marginsCustom = this.getSettingValue('customMargins');
     }
     this.lastTicket_ = ticket;

chrome/test/data/webui/print_preview/custom_margins_test.js

@@ -231,8 +231,7 @@ cr.define('custom_margins_test', function() {
       const marginValues = setupCustomMargins();
       return finishSetup().then(() => {
         // Simulate setting custom margins.
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
 
         // Validate control positions are set based on the custom values.
         const controls = getControls();
@@ -249,7 +248,7 @@ cr.define('custom_margins_test', function() {
         // Margins should be reset to default and custom margins values should
         // be cleared.
         expectEquals(
-            print_preview.MarginsTypeValue.DEFAULT,
+            print_preview.MarginsType.DEFAULT,
             container.getSettingValue('margins'));
         expectEquals(
             '{}', JSON.stringify(container.getSettingValue('customMargins')));
@@ -279,8 +278,7 @@ cr.define('custom_margins_test', function() {
             let onTransitionEnd = getAllTransitions(controls);
             // Controls become visible when margin type CUSTOM is selected.
             model.set(
-                'settings.margins.value',
-                print_preview.MarginsTypeValue.CUSTOM);
+                'settings.margins.value', print_preview.MarginsType.CUSTOM);
 
             // Wait for the opacity transitions to finish.
             return onTransitionEnd;
@@ -336,8 +334,7 @@ cr.define('custom_margins_test', function() {
         const controls = getControls();
 
         // Simulate setting custom margins from sticky settings.
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
         const marginValues = setupCustomMargins();
         model.notifyPath('settings.customMargins.value');
         Polymer.dom.flush();
@@ -382,8 +379,7 @@ cr.define('custom_margins_test', function() {
 
       return finishSetup().then(() => {
         const controls = getControls();
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
         Polymer.dom.flush();
 
 
@@ -441,8 +437,7 @@ cr.define('custom_margins_test', function() {
         controls.forEach(c => {
           c.getInput().setAttribute('data-timeout-delay', 1);
         });
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
         Polymer.dom.flush();
 
         // Verify entering a new value updates the settings.
@@ -487,8 +482,7 @@ cr.define('custom_margins_test', function() {
         controls.forEach(c => {
           c.getInput().setAttribute('data-timeout-delay', 1);
         });
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
         Polymer.dom.flush();
 
         // Verify entering a new value updates the settings.
@@ -538,8 +532,7 @@ cr.define('custom_margins_test', function() {
       return finishSetup().then(() => {
         // Simulate setting custom margins.
         const controls = getControls();
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
 
         // Validate control positions are set based on the custom values.
         controls.forEach((control, index) => {
@@ -549,8 +542,7 @@ cr.define('custom_margins_test', function() {
         });
 
         // Simulate setting minimum margins.
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.MINIMUM);
+        model.set('settings.margins.value', print_preview.MarginsType.MINIMUM);
 
         // Validate control positions still reflect the custom values.
         controls.forEach((control, index) => {
@@ -568,8 +560,7 @@ cr.define('custom_margins_test', function() {
           .then(() => {
             // Simulate setting custom margins again.
             model.set(
-                'settings.margins.value',
-                print_preview.MarginsTypeValue.CUSTOM);
+                'settings.margins.value', print_preview.MarginsType.CUSTOM);
 
             // Validate control positions are initialized based on the default
             // values.
@@ -586,8 +577,7 @@ cr.define('custom_margins_test', function() {
     test(assert(TestNames.LayoutClearsCustomMargins), function() {
       return validateMarginsClearedForSetting('layout', true).then(() => {
         // Simulate setting custom margins again
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
 
         // Validate control positions are initialized based on the default
         // values.
@@ -637,8 +627,7 @@ cr.define('custom_margins_test', function() {
 
             // Controls become visible when margin type CUSTOM is selected.
             model.set(
-                'settings.margins.value',
-                print_preview.MarginsTypeValue.CUSTOM);
+                'settings.margins.value', print_preview.MarginsType.CUSTOM);
             container.notifyPath('settings.customMargins.value');
             Polymer.dom.flush();
             return onTransitionEnd;
@@ -683,8 +672,7 @@ cr.define('custom_margins_test', function() {
     test(assert(TestNames.ControlsDisabledOnError), function() {
       return finishSetup().then(() => {
         // Simulate setting custom margins.
-        model.set(
-            'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+        model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
 
         const controls = getControls();
         controls.forEach(control => assertFalse(control.disabled));

chrome/test/data/webui/print_preview/margins_settings_test.js

@@ -19,7 +19,7 @@ cr.define('margins_settings_test', function() {
       marginsSection.settings = model.settings;
       marginsSection.disabled = false;
       test_util.fakeDataBind(model, marginsSection, 'settings');
-      marginsTypeEnum = print_preview.MarginsTypeValue;
+      marginsTypeEnum = print_preview.MarginsType;
     });
 
     // Tests that setting the setting updates the UI.

chrome/test/data/webui/print_preview/model_settings_availability_test.js

@@ -375,13 +375,11 @@ cr.define('model_settings_availability_test', function() {
       assertTrue(model.settings.headerFooter.available);
 
       // Set margins to NONE
-      model.set(
-          'settings.margins.value', print_preview.MarginsTypeValue.NO_MARGINS);
+      model.set('settings.margins.value', print_preview.MarginsType.NO_MARGINS);
       assertFalse(model.settings.headerFooter.available);
 
       // Custom margins of 0.
-      model.set(
-          'settings.margins.value', print_preview.MarginsTypeValue.CUSTOM);
+      model.set('settings.margins.value', print_preview.MarginsType.CUSTOM);
       model.set(
           'settings.customMargins.value',
           {marginTop: 0, marginLeft: 0, marginRight: 0, marginBottom: 0});
@@ -426,8 +424,7 @@ cr.define('model_settings_availability_test', function() {
         ]
       };
       model.set('destination.capabilities', capabilities);
-      model.set(
-          'settings.margins.value', print_preview.MarginsTypeValue.DEFAULT);
+      model.set('settings.margins.value', print_preview.MarginsType.DEFAULT);
 
       // Header/footer should be available for default big label with
       // default margins.

chrome/test/data/webui/print_preview/model_test.js

@@ -188,7 +188,7 @@ cr.define('model_test', function() {
         layout: true,
         color: false,
         mediaSize: testDestination.capabilities.printer.media_size.option[1],
-        margins: print_preview.MarginsTypeValue.CUSTOM,
+        margins: print_preview.MarginsType.CUSTOM,
         customMargins: {
           marginTop: 100,
           marginRight: 200,
@@ -278,7 +278,7 @@ cr.define('model_test', function() {
         landscape: false,
         color: testDestination.getNativeColorModel(true),
         headerFooterEnabled: false,  // Only used in print preview
-        marginsType: print_preview.MarginsTypeValue.DEFAULT,
+        marginsType: print_preview.MarginsType.DEFAULT,
         duplex: print_preview.DuplexMode.SIMPLEX,
         copies: 1,
         collate: true,
@@ -319,7 +319,7 @@ cr.define('model_test', function() {
         landscape: true,
         color: testDestination.getNativeColorModel(false),
         headerFooterEnabled: false,
-        marginsType: print_preview.MarginsTypeValue.CUSTOM,
+        marginsType: print_preview.MarginsType.CUSTOM,
         duplex: print_preview.DuplexMode.SHORT_EDGE,
         copies: 2,
         collate: false,

chrome/test/data/webui/print_preview/pages_per_sheet_settings_test.js

@@ -34,14 +34,14 @@ cr.define('pages_per_sheet_settings_test', function() {
     // Tests that setting the pages per sheet setting resets margins to DEFAULT.
     test('resets margins setting', async () => {
       pagesPerSheetSection.setSetting(
-          'margins', print_preview.MarginsTypeValue.NO_MARGINS);
+          'margins', print_preview.MarginsType.NO_MARGINS);
       assertEquals(1, pagesPerSheetSection.getSettingValue('pagesPerSheet'));
       pagesPerSheetSection.setSetting('pagesPerSheet', 4);
       await test_util.eventToPromise(
           'process-select-change', pagesPerSheetSection);
       assertEquals(4, pagesPerSheetSection.getSettingValue('pagesPerSheet'));
       assertEquals(
-          print_preview.MarginsTypeValue.DEFAULT,
+          print_preview.MarginsType.DEFAULT,
           pagesPerSheetSection.getSettingValue('margins'));
     });
 

chrome/test/data/webui/print_preview/preview_generation_test.js

@@ -151,10 +151,9 @@ cr.define('preview_generation_test', function() {
     /** Validate changing the margins updates the preview. */
     test(assert(TestNames.Margins), function() {
       return testSimpleSetting(
-          'margins', print_preview.MarginsTypeValue.DEFAULT,
-          print_preview.MarginsTypeValue.MINIMUM, 'marginsType',
-          print_preview.MarginsTypeValue.DEFAULT,
-          print_preview.MarginsTypeValue.MINIMUM);
+          'margins', print_preview.MarginsType.DEFAULT,
+          print_preview.MarginsType.MINIMUM, 'marginsType',
+          print_preview.MarginsType.DEFAULT, print_preview.MarginsType.MINIMUM);
     });
 
     /**
@@ -166,14 +165,13 @@ cr.define('preview_generation_test', function() {
           .then(function(args) {
             const originalTicket = JSON.parse(args.printTicket);
             assertEquals(
-                print_preview.MarginsTypeValue.DEFAULT,
-                originalTicket.marginsType);
+                print_preview.MarginsType.DEFAULT, originalTicket.marginsType);
             // Custom margins should not be set in the ticket.
             assertEquals(undefined, originalTicket.marginsCustom);
             assertEquals(0, originalTicket.requestID);
 
             // This should do nothing.
-            page.setSetting('margins', print_preview.MarginsTypeValue.CUSTOM);
+            page.setSetting('margins', print_preview.MarginsType.CUSTOM);
             // Sets only 1 side, not valid.
             page.setSetting('customMargins', {marginTop: 25});
             // 2 sides, still not valid.
@@ -190,17 +188,16 @@ cr.define('preview_generation_test', function() {
           })
           .then(function(args) {
             const ticket = JSON.parse(args.printTicket);
-            assertEquals(
-                print_preview.MarginsTypeValue.CUSTOM, ticket.marginsType);
+            assertEquals(print_preview.MarginsType.CUSTOM, ticket.marginsType);
             assertEquals(25, ticket.marginsCustom.marginTop);
             assertEquals(40, ticket.marginsCustom.marginRight);
             assertEquals(20, ticket.marginsCustom.marginBottom);
             assertEquals(50, ticket.marginsCustom.marginLeft);
             assertEquals(1, ticket.requestID);
-            page.setSetting('margins', print_preview.MarginsTypeValue.DEFAULT);
+            page.setSetting('margins', print_preview.MarginsType.DEFAULT);
             // Set setting to something invalid and then set margins to CUSTOM.
             page.setSetting('customMargins', {marginTop: 25, marginRight: 40});
-            page.setSetting('margins', print_preview.MarginsTypeValue.CUSTOM);
+            page.setSetting('margins', print_preview.MarginsType.CUSTOM);
             nativeLayer.resetResolver('getPreview');
             page.setSetting('customMargins', {
               marginTop: 25,
@@ -212,8 +209,7 @@ cr.define('preview_generation_test', function() {
           })
           .then(function(args) {
             const ticket = JSON.parse(args.printTicket);
-            assertEquals(
-                print_preview.MarginsTypeValue.CUSTOM, ticket.marginsType);
+            assertEquals(print_preview.MarginsType.CUSTOM, ticket.marginsType);
             assertEquals(25, ticket.marginsCustom.marginTop);
             assertEquals(40, ticket.marginsCustom.marginRight);
             assertEquals(20, ticket.marginsCustom.marginBottom);
@@ -227,10 +223,10 @@ cr.define('preview_generation_test', function() {
 
     /**
      * Validate changing the pages per sheet updates the preview, and resets
-     * margins to print_preview.MarginsTypeValue.DEFAULT.
+     * margins to print_preview.MarginsType.DEFAULT.
      */
     test(assert(TestNames.ChangeMarginsByPagesPerSheet), function() {
-      const MarginsTypeEnum = print_preview.MarginsTypeValue;
+      const MarginsTypeEnum = print_preview.MarginsType;
       return initialize()
           .then(function(args) {
             const originalTicket = JSON.parse(args.printTicket);
@@ -466,7 +462,7 @@ cr.define('preview_generation_test', function() {
       /**
        * @param {Object} ticket The parsed print ticket
        * @param {number} expectedId The expected ticket request ID
-       * @param {!print_preview.MarginsTypeValue} expectedMargins
+       * @param {!print_preview.MarginsType} expectedMargins
        *     The expected ticket margins type
        * @param {boolean} expectedHeaderFooter The expected ticket
        *     header/footer value
@@ -491,7 +487,7 @@ cr.define('preview_generation_test', function() {
         printableAreaHeight: 792,
       });
 
-      const MarginsTypeEnum = print_preview.MarginsTypeValue;
+      const MarginsTypeEnum = print_preview.MarginsType;
       let previewArgs = await initialize();
       let ticket = JSON.parse(previewArgs.printTicket);
 

chrome/test/data/webui/print_preview/restore_state_test.js

@@ -219,7 +219,7 @@ cr.define('restore_state_test', function() {
           section: 'print-preview-margins-settings',
           settingName: 'margins',
           key: 'marginsType',
-          value: print_preview.MarginsTypeValue.MINIMUM,
+          value: print_preview.MarginsType.MINIMUM,
         },
         {
           section: 'print-preview-dpi-settings',