[CrOS Settings] Rename button_bar 'Next' button to 'Forward'.

This button is being renamed as it will be modularized to have a dynamic
label in a follow-up CL.

Bug: 1093185
Change-Id: I70f49ffaa35d73b25ea1d5f23521cf93a8c4cf8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2629661
Commit-Queue: Gordon Seto <gordonseto@google.com>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843834}

chrome/test/data/webui/cr_components/chromeos/cellular_setup/button_bar_test.js

@@ -31,7 +31,7 @@ suite('CellularSetupButtonBarTest', function() {
     buttonBar.buttonState = {
       backward: state,
       cancel: state,
-      next: state,
+      forward: state,
       tryAgain: state,
       done: state,
       skipDiscovery: state,
@@ -68,7 +68,7 @@ suite('CellularSetupButtonBarTest', function() {
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#backward')));
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#cancel')));
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#tryAgain')));
-    assertTrue(isButtonShownAndEnabled(buttonBar.$$('#next')));
+    assertTrue(isButtonShownAndEnabled(buttonBar.$$('#forward')));
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#done')));
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#skipDiscovery')));
   });
@@ -78,7 +78,7 @@ suite('CellularSetupButtonBarTest', function() {
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#backward')));
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#cancel')));
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#tryAgain')));
-    assertTrue(isButtonShownAndDisabled(buttonBar.$$('#next')));
+    assertTrue(isButtonShownAndDisabled(buttonBar.$$('#forward')));
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#done')));
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#skipDiscovery')));
   });
@@ -88,7 +88,7 @@ suite('CellularSetupButtonBarTest', function() {
     assertTrue(isButtonHidden(buttonBar.$$('#backward')));
     assertTrue(isButtonHidden(buttonBar.$$('#cancel')));
     assertTrue(isButtonHidden(buttonBar.$$('#tryAgain')));
-    assertTrue(isButtonHidden(buttonBar.$$('#next')));
+    assertTrue(isButtonHidden(buttonBar.$$('#forward')));
     assertTrue(isButtonHidden(buttonBar.$$('#done')));
     assertTrue(isButtonHidden(buttonBar.$$('#skipDiscovery')));
   });

chrome/test/data/webui/cr_components/chromeos/cellular_setup/esim_flow_ui_test.js

@@ -64,9 +64,9 @@ suite('CrComponentsEsimFlowUiTest', function() {
     confirmationCodeInput.value = 'CONFIRMATION_CODE';
     assertFalse(confirmationCodeInput.invalid);
 
-    // Next button should now be enabled.
+    // Forward button should now be enabled.
     assertTrue(
-        eSimPage.buttonState.next ===
+        eSimPage.buttonState.forward ===
         cellularSetup.ButtonState.SHOWN_AND_ENABLED);
 
     eSimPage.navigateForward();
@@ -94,9 +94,9 @@ suite('CrComponentsEsimFlowUiTest', function() {
       // Insert an activation code.
       activationCodePage.$$('#activationCode').value = 'ACTIVATION_CODE';
 
-      // Next button should now be enabled.
+      // Forward button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.next ===
+          eSimPage.buttonState.forward ===
           cellularSetup.ButtonState.SHOWN_AND_ENABLED);
     });
 
@@ -296,9 +296,9 @@ suite('CrComponentsEsimFlowUiTest', function() {
       // Insert an activation code.
       activationCodePage.$$('#activationCode').value = 'ACTIVATION_CODE';
 
-      // Simulate pressing 'Next'.
+      // Simulate pressing 'Forward'.
       assertTrue(
-          eSimPage.buttonState.next ===
+          eSimPage.buttonState.forward ===
           cellularSetup.ButtonState.SHOWN_AND_ENABLED);
       eSimPage.navigateForward();
       await flushAsync();
@@ -313,15 +313,15 @@ suite('CrComponentsEsimFlowUiTest', function() {
       profileList.selectItem(profileList.items[0]);
       Polymer.dom.flush();
 
-      // The 'Next' button should now be enabled.
+      // The 'Forward' button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.next ===
+          eSimPage.buttonState.forward ===
           cellularSetup.ButtonState.SHOWN_AND_ENABLED);
       assertTrue(
           eSimPage.buttonState.skipDiscovery ===
           cellularSetup.ButtonState.HIDDEN);
 
-      // Simulate pressing 'Next'.
+      // Simulate pressing 'Forward'.
       eSimPage.navigateForward();
       await flushAsync();
 
@@ -342,15 +342,15 @@ suite('CrComponentsEsimFlowUiTest', function() {
       profileListUI.selectItem(profileListUI.items[0]);
       Polymer.dom.flush();
 
-      // The 'Next' button should now be enabled.
+      // The 'Forward' button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.next ===
+          eSimPage.buttonState.forward ===
           cellularSetup.ButtonState.SHOWN_AND_ENABLED);
       assertTrue(
           eSimPage.buttonState.skipDiscovery ===
           cellularSetup.ButtonState.HIDDEN);
 
-      // Simulate pressing 'Next'.
+      // Simulate pressing 'Forward'.
       eSimPage.navigateForward();
       await flushAsync();
 
@@ -362,9 +362,9 @@ suite('CrComponentsEsimFlowUiTest', function() {
           chromeos.cellularSetup.mojom.ProfileInstallResult.kSuccess);
       confirmationCodePage.$$('#confirmationCode').value = 'CONFIRMATION_CODE';
 
-      // Next button should now be enabled.
+      // Forward button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.next ===
+          eSimPage.buttonState.forward ===
           cellularSetup.ButtonState.SHOWN_AND_ENABLED);
 
       eSimPage.navigateForward();

ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.html

@@ -58,11 +58,11 @@
         hidden$="[[isButtonHidden_(Button.SKIP_DISCOVERY, buttonState.*)]]">
       [[i18n('skipDiscovery')]]
     </cr-button>
-    <cr-button id="next"
+    <cr-button id="forward"
         class="action-button"
-        on-click="onNextButtonClicked_"
-        disabled="[[isButtonDisabled_(Button.NEXT, buttonState.*)]]"
-        hidden$="[[isButtonHidden_(Button.NEXT, buttonState.*)]]">
+        on-click="onForwardButtonClicked_"
+        disabled="[[isButtonDisabled_(Button.FORWARD, buttonState.*)]]"
+        hidden$="[[isButtonHidden_(Button.FORWARD, buttonState.*)]]">
       [[i18n('next')]]
     </cr-button>
   </template>

ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.js

@@ -67,7 +67,7 @@ Polymer({
   },
 
   /** @private */
-  onNextButtonClicked_() {
+  onForwardButtonClicked_() {
     this.fire('forward-nav-requested');
   },
 
@@ -85,8 +85,8 @@ Polymer({
         return this.buttonState.cancel;
       case cellularSetup.Button.DONE:
         return this.buttonState.done;
-      case cellularSetup.Button.NEXT:
-        return this.buttonState.next;
+      case cellularSetup.Button.FORWARD:
+        return this.buttonState.forward;
       case cellularSetup.Button.TRY_AGAIN:
         return this.buttonState.tryAgain;
       case cellularSetup.Button.SKIP_DISCOVERY:

ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_types.js

@@ -25,7 +25,7 @@ cr.define('cellularSetup', function() {
     BACKWARD: 1,
     CANCEL: 2,
     DONE: 3,
-    NEXT: 4,
+    FORWARD: 4,
     TRY_AGAIN: 5,
     SKIP_DISCOVERY: 6,
   };
@@ -35,7 +35,7 @@ cr.define('cellularSetup', function() {
    *   backward: (!cellularSetup.ButtonState|undefined),
    *   cancel: (!cellularSetup.ButtonState|undefined),
    *   done: (!cellularSetup.ButtonState|undefined),
-   *   next: (!cellularSetup.ButtonState|undefined),
+   *   forward: (!cellularSetup.ButtonState|undefined),
    *   tryAgain: (!cellularSetup.ButtonState|undefined),
    *   skipDiscovery: (!cellularSetup.ButtonState|undefined),
    * }}

ui/webui/resources/cr_components/chromeos/cellular_setup/esim_flow_ui.js

@@ -236,7 +236,7 @@ cr.define('cellular_setup', function() {
                 cellularSetup.ButtonState.SHOWN_AND_ENABLED :
                 cellularSetup.ButtonState.HIDDEN,
             done: cellularSetup.ButtonState.HIDDEN,
-            next: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
+            forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.HIDDEN,
           };
@@ -249,7 +249,7 @@ cr.define('cellular_setup', function() {
                 cellularSetup.ButtonState.HIDDEN,
             done: cellularSetup.ButtonState.HIDDEN,
             // TODO(crbug.com/1093185) Add a "Confirm" button state.
-            next: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
+            forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.HIDDEN,
           };
@@ -261,7 +261,7 @@ cr.define('cellular_setup', function() {
                 cellularSetup.ButtonState.SHOWN_AND_ENABLED :
                 cellularSetup.ButtonState.HIDDEN,
             done: cellularSetup.ButtonState.HIDDEN,
-            next: cellularSetup.ButtonState.HIDDEN,
+            forward: cellularSetup.ButtonState.HIDDEN,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
           };
@@ -271,7 +271,7 @@ cr.define('cellular_setup', function() {
             backward: cellularSetup.ButtonState.HIDDEN,
             cancel: cellularSetup.ButtonState.HIDDEN,
             done: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            next: cellularSetup.ButtonState.HIDDEN,
+            forward: cellularSetup.ButtonState.HIDDEN,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.HIDDEN,
           };
@@ -287,10 +287,11 @@ cr.define('cellular_setup', function() {
     onActivationCodeUpdated_(event) {
       if (event.detail.activationCode) {
         this.set(
-            'buttonState.next', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+            'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
       } else {
         this.set(
-            'buttonState.next', cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+            'buttonState.forward',
+            cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
       }
     },
 
@@ -299,12 +300,12 @@ cr.define('cellular_setup', function() {
       if (this.selectedProfile_) {
         this.set('buttonState.skipDiscovery', cellularSetup.ButtonState.HIDDEN);
         this.set(
-            'buttonState.next', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+            'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
       } else {
         this.set(
             'buttonState.skipDiscovery',
             cellularSetup.ButtonState.SHOWN_AND_ENABLED);
-        this.set('buttonState.next', cellularSetup.ButtonState.HIDDEN);
+        this.set('buttonState.forward', cellularSetup.ButtonState.HIDDEN);
       }
     },
 
@@ -314,10 +315,11 @@ cr.define('cellular_setup', function() {
       // state.
       if (this.confirmationCode_) {
         this.set(
-            'buttonState.next', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+            'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
       } else {
         this.set(
-            'buttonState.next', cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+            'buttonState.forward',
+            cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
       }
     },
 

ui/webui/resources/cr_components/chromeos/cellular_setup/psim_flow_ui.js

@@ -181,7 +181,7 @@ cr.define('cellularSetup', function() {
     },
 
     navigateForward() {
-      // Navigate forward is only called by clicking next button
+      // Navigate forward is only called by clicking forward button
       // from the provisioning page.
       assert(this.selectedPSimPageName_ === PSimPageName.PROVISIONING);
       this.state_ = PSimUIState.WAITING_FOR_ACTIVATION_TO_FINISH;
@@ -210,7 +210,7 @@ cr.define('cellularSetup', function() {
             backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
             cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
             done: cellularSetup.ButtonState.HIDDEN,
-            next: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
+            forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.HIDDEN,
           };
@@ -222,7 +222,7 @@ cr.define('cellularSetup', function() {
             backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
             cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
             done: cellularSetup.ButtonState.HIDDEN,
-            next: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
+            forward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.HIDDEN,
           };
@@ -233,7 +233,7 @@ cr.define('cellularSetup', function() {
             backward: cellularSetup.ButtonState.HIDDEN,
             cancel: cellularSetup.ButtonState.HIDDEN,
             done: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            next: cellularSetup.ButtonState.HIDDEN,
+            forward: cellularSetup.ButtonState.HIDDEN,
             tryAgain: cellularSetup.ButtonState.HIDDEN,
             skipDiscovery: cellularSetup.ButtonState.HIDDEN,
           };

ui/webui/resources/cr_components/chromeos/cellular_setup/setup_selection_flow.js

@@ -52,10 +52,11 @@ Polymer({
     };
     if (selectedPage === cellularSetup.CellularSetupPageName.PSIM_FLOW_UI ||
         selectedPage === cellularSetup.CellularSetupPageName.ESIM_FLOW_UI) {
-      this.set('buttonState.next', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+      this.set(
+          'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
     } else {
       this.set(
-          'buttonState.next', cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+          'buttonState.forward', cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
     }
   }
 });
\ No newline at end of file