Print Preview Refresh: Fix enter key blocked in pages input (M71)

Bug: 894350
Change-Id: Ic5cde2aef449e745e1301ee0c09b6e9ad50308e3
Reviewed-on: https://chromium-review.googlesource.com/c/1278534
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#599291}(cherry picked from commit aa73099)
Reviewed-on: https://chromium-review.googlesource.com/c/1284056
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/branch-heads/3578@{#52}
Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}

chrome/browser/resources/print_preview/new/pages_settings.js

@@ -354,11 +354,17 @@ Polymer({
    * @param {!KeyboardEvent} e The keyboard event
    */
   onKeydown_: function(e) {
-    e.stopPropagation();
-    if (e.key == 'Enter') {
+    if (e.key === 'Escape')
+      return;
+
+    if (e.key === 'Enter') {
       this.resetAndUpdate();
       this.resetIfEmpty_();
-    } else if (e.shiftKey && e.key == 'Tab') {
+      return;
+    }
+
+    e.stopPropagation();
+    if (e.shiftKey && e.key === 'Tab') {
       this.$.customRadioButton.focus();
       e.preventDefault();
     }

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

@@ -13,6 +13,7 @@ cr.define('pages_settings_test', function() {
     ClickingCustomFocusesInput: 'clicking custom focuses input',
     InputNotDisabledOnValidityChange: 'input not disabled on validity change',
     IgnoreInputKeyEvents: 'ignore input key events',
+    EnterOnInputTriggersPrint: 'enter on input triggers print',
   };
 
   const suiteName = 'PagesSettingsTest';
@@ -501,6 +502,49 @@ cr.define('pages_settings_test', function() {
           });
 
     });
+
+    // Verifies that the enter key event is bubbled to the pages settings
+    // element, so that it will be bubbled to the print preview app to trigger a
+    // print.
+    test(assert(TestNames.EnterOnInputTriggersPrint), function() {
+      const input = pagesSection.$.pageSettingsCustomInput.inputElement;
+      const radioGroup = pagesSection.$$('paper-radio-group');
+      const whenPrintReceived =
+          test_util.eventToPromise('keydown', pagesSection);
+
+      // Setup an empty input by clicking on the custom radio button.
+      const inputFocused = test_util.eventToPromise('focus', input);
+      pagesSection.$.customRadioButton.click();
+      return inputFocused
+          .then(function() {
+            assertEquals(
+                pagesSection.pagesValueEnum_.CUSTOM, radioGroup.selected);
+            MockInteractions.keyEventOn(input, 'keydown', 13, [], 'Enter');
+            return whenPrintReceived;
+          })
+          // All gets automatically selected
+          .then(function() {
+            assertEquals(pagesSection.pagesValueEnum_.ALL, radioGroup.selected);
+            // Refocus the radio group to reset the focused button to "all".
+            // Normally, enter results in print, so this does not need to
+            // happen.
+            radioGroup.focus();
+            return setupInput('1', 3);
+          })
+          // Re-select custom and print again.
+          .then(function() {
+            assertEquals(
+                pagesSection.pagesValueEnum_.CUSTOM, radioGroup.selected);
+            const whenPrintReceived =
+                test_util.eventToPromise('keydown', pagesSection);
+            MockInteractions.keyEventOn(input, 'keydown', 13, [], 'Enter');
+            return whenPrintReceived;
+          })
+          .then(function() {
+            assertEquals(
+                pagesSection.pagesValueEnum_.CUSTOM, radioGroup.selected);
+          });
+    });
   });
 
   return {

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

@@ -159,6 +159,12 @@ TEST_F('PrintPreviewPagesSettingsTest', 'IgnoreInputKeyEvents', function() {
   this.runMochaTest(pages_settings_test.TestNames.IgnoreInputKeyEvents);
 });
 
+TEST_F(
+    'PrintPreviewPagesSettingsTest', 'EnterOnInputTriggersPrint', function() {
+      this.runMochaTest(
+          pages_settings_test.TestNames.EnterOnInputTriggersPrint);
+    });
+
 PrintPreviewNumberSettingsSectionInteractiveTest =
     class extends PrintPreviewInteractiveUITest {
   /** @override */