Update complete button text at end of Welcome Tour.

Per PM request, update the complete button text at the end of the
Welcome Tour from "Close" to "Open Explore".

Bug: b:297069859
Change-Id: I27061870f15caadca6fbe5db78217eecfd72c3bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4807253
Reviewed-by: Angus McLean <angusmclean@google.com>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/main@{#1189846}

ash/ash_strings.grd

@@ -7008,6 +7008,9 @@ To shut down the device, press and hold the power button on the device again.
       </message>
 
       <!-- Welcome Tour -->
+      <message name="IDS_ASH_WELCOME_TOUR_COMPLETE_BUTTON_TEXT" desc="Text shown on the button that completes the System UI Welcome Tour tutorial when triggered and opens the Explore app.">
+       Open Explore
+      </message>
       <message name="IDS_ASH_WELCOME_TOUR_DIALOG_ACCEPT_BUTTON_TEXT" desc="Text shown on the dialog's button that starts the System UI Welcome Tour tutorial when triggered.">
         Quick tour
       </message>

ash/ash_strings_grd/IDS_ASH_WELCOME_TOUR_COMPLETE_BUTTON_TEXT.png.sha1

@@ -0,0 +1 @@
+d5c1a9ec0d9d90c8bf305c5ed6d8feca087f5042

ash/user_education/welcome_tour/welcome_tour_controller.cc

@@ -154,6 +154,9 @@ WelcomeTourController::GetTutorialDescriptions() {
                    std::forward_as_tuple())
           .first->second;
 
+  tutorial_description.complete_button_text_id =
+      IDS_ASH_WELCOME_TOUR_COMPLETE_BUTTON_TEXT;
+
   // Step 0: Dialog.
   tutorial_description.steps.emplace_back(
       user_education::TutorialDescription::HiddenStep::WaitForShown(

ash/user_education/welcome_tour/welcome_tour_controller_unittest.cc

@@ -270,61 +270,69 @@ TEST_F(WelcomeTourControllerTest, GetTutorialDescriptions) {
       tutorial_descriptions_by_id,
       Contains(Pair(
           Eq(TutorialId::kWelcomeTourPrototype1),
-          Field(
-              &TutorialDescription::steps,
-              ElementsAre(
-                  ShownStep(ElementSpecifier(kWelcomeTourDialogElementId),
-                            ContextMode::kAny),
-                  HiddenStep(ElementSpecifier(kWelcomeTourDialogElementId),
-                             ContextMode::kFromPreviousStep),
-                  BubbleStep(ElementSpecifier(kShelfViewElementId),
-                             ContextMode::kInitial,
-                             HelpBubbleId::kWelcomeTourShelf,
-                             IDS_ASH_WELCOME_TOUR_SHELF_BUBBLE_BODY_TEXT,
-                             HelpBubbleArrow::kBottomCenter,
-                             /*has_next_button=*/true),
-                  EventStep(ElementSpecifier(kShelfViewElementId),
-                            ContextMode::kFromPreviousStep,
-                            /*has_name_elements_callback=*/true),
-                  BubbleStep(ElementSpecifier(kUnifiedSystemTrayElementName),
-                             ContextMode::kAny,
-                             HelpBubbleId::kWelcomeTourStatusArea,
-                             IDS_ASH_WELCOME_TOUR_STATUS_AREA_BUBBLE_BODY_TEXT,
-                             HelpBubbleArrow::kBottomRight,
-                             /*has_next_button=*/true),
-                  EventStep(ElementSpecifier(kUnifiedSystemTrayElementName),
-                            ContextMode::kFromPreviousStep,
-                            /*has_name_elements_callback=*/true),
-                  BubbleStep(ElementSpecifier(kHomeButtonElementName),
-                             ContextMode::kAny,
-                             HelpBubbleId::kWelcomeTourHomeButton,
-                             IDS_ASH_WELCOME_TOUR_HOME_BUTTON_BUBBLE_BODY_TEXT,
-                             HelpBubbleArrow::kBottomLeft,
-                             /*has_next_button=*/true),
-                  BubbleStep(ElementSpecifier(kSearchBoxViewElementId),
-                             ContextMode::kAny,
-                             HelpBubbleId::kWelcomeTourSearchBox,
-                             IDS_ASH_WELCOME_TOUR_SEARCH_BOX_BUBBLE_BODY_TEXT,
-                             HelpBubbleArrow::kTopCenter,
-                             /*has_next_button=*/true),
-                  EventStep(ElementSpecifier(kSearchBoxViewElementId),
-                            ContextMode::kFromPreviousStep,
-                            /*has_name_elements_callback=*/false),
-                  BubbleStep(ElementSpecifier(kSettingsAppElementId),
-                             ContextMode::kFromPreviousStep,
-                             HelpBubbleId::kWelcomeTourSettingsApp,
-                             IDS_ASH_WELCOME_TOUR_SETTINGS_APP_BUBBLE_BODY_TEXT,
-                             HelpBubbleArrow::kBottomLeft,
-                             /*has_next_button=*/true),
-                  EventStep(ElementSpecifier(kSettingsAppElementId),
-                            ContextMode::kFromPreviousStep,
-                            /*has_name_elements_callback=*/false),
-                  BubbleStep(ElementSpecifier(kExploreAppElementId),
-                             ContextMode::kFromPreviousStep,
-                             HelpBubbleId::kWelcomeTourExploreApp,
-                             IDS_ASH_WELCOME_TOUR_EXPLORE_APP_BUBBLE_BODY_TEXT,
-                             HelpBubbleArrow::kBottomLeft,
-                             /*has_next_button=*/false))))));
+          AllOf(
+              Field(&TutorialDescription::complete_button_text_id,
+                    Eq(IDS_ASH_WELCOME_TOUR_COMPLETE_BUTTON_TEXT)),
+              Field(
+                  &TutorialDescription::steps,
+                  ElementsAre(
+                      ShownStep(ElementSpecifier(kWelcomeTourDialogElementId),
+                                ContextMode::kAny),
+                      HiddenStep(ElementSpecifier(kWelcomeTourDialogElementId),
+                                 ContextMode::kFromPreviousStep),
+                      BubbleStep(ElementSpecifier(kShelfViewElementId),
+                                 ContextMode::kInitial,
+                                 HelpBubbleId::kWelcomeTourShelf,
+                                 IDS_ASH_WELCOME_TOUR_SHELF_BUBBLE_BODY_TEXT,
+                                 HelpBubbleArrow::kBottomCenter,
+                                 /*has_next_button=*/true),
+                      EventStep(ElementSpecifier(kShelfViewElementId),
+                                ContextMode::kFromPreviousStep,
+                                /*has_name_elements_callback=*/true),
+                      BubbleStep(
+                          ElementSpecifier(kUnifiedSystemTrayElementName),
+                          ContextMode::kAny,
+                          HelpBubbleId::kWelcomeTourStatusArea,
+                          IDS_ASH_WELCOME_TOUR_STATUS_AREA_BUBBLE_BODY_TEXT,
+                          HelpBubbleArrow::kBottomRight,
+                          /*has_next_button=*/true),
+                      EventStep(ElementSpecifier(kUnifiedSystemTrayElementName),
+                                ContextMode::kFromPreviousStep,
+                                /*has_name_elements_callback=*/true),
+                      BubbleStep(
+                          ElementSpecifier(kHomeButtonElementName),
+                          ContextMode::kAny,
+                          HelpBubbleId::kWelcomeTourHomeButton,
+                          IDS_ASH_WELCOME_TOUR_HOME_BUTTON_BUBBLE_BODY_TEXT,
+                          HelpBubbleArrow::kBottomLeft,
+                          /*has_next_button=*/true),
+                      BubbleStep(
+                          ElementSpecifier(kSearchBoxViewElementId),
+                          ContextMode::kAny,
+                          HelpBubbleId::kWelcomeTourSearchBox,
+                          IDS_ASH_WELCOME_TOUR_SEARCH_BOX_BUBBLE_BODY_TEXT,
+                          HelpBubbleArrow::kTopCenter,
+                          /*has_next_button=*/true),
+                      EventStep(ElementSpecifier(kSearchBoxViewElementId),
+                                ContextMode::kFromPreviousStep,
+                                /*has_name_elements_callback=*/false),
+                      BubbleStep(
+                          ElementSpecifier(kSettingsAppElementId),
+                          ContextMode::kFromPreviousStep,
+                          HelpBubbleId::kWelcomeTourSettingsApp,
+                          IDS_ASH_WELCOME_TOUR_SETTINGS_APP_BUBBLE_BODY_TEXT,
+                          HelpBubbleArrow::kBottomLeft,
+                          /*has_next_button=*/true),
+                      EventStep(ElementSpecifier(kSettingsAppElementId),
+                                ContextMode::kFromPreviousStep,
+                                /*has_name_elements_callback=*/false),
+                      BubbleStep(
+                          ElementSpecifier(kExploreAppElementId),
+                          ContextMode::kFromPreviousStep,
+                          HelpBubbleId::kWelcomeTourExploreApp,
+                          IDS_ASH_WELCOME_TOUR_EXPLORE_APP_BUBBLE_BODY_TEXT,
+                          HelpBubbleArrow::kBottomLeft,
+                          /*has_next_button=*/false)))))));
 }
 
 // Verifies that the Welcome Tour is started when the primary user session is

chrome/browser/ui/ash/user_education/welcome_tour/welcome_tour_interactive_uitest.cc

@@ -308,7 +308,8 @@ IN_PROC_BROWSER_TEST_F(WelcomeTourInteractiveUiTest, WelcomeTour) {
                 CheckHelpBubbleBodyText(
                     IDS_ASH_WELCOME_TOUR_EXPLORE_APP_BUBBLE_BODY_TEXT),
                 CheckHelpBubbleDefaultButtonFocus(true),
-                CheckHelpBubbleDefaultButtonText(IDS_TUTORIAL_CLOSE_TUTORIAL),
+                CheckHelpBubbleDefaultButtonText(
+                    IDS_ASH_WELCOME_TOUR_COMPLETE_BUTTON_TEXT),
                 PressHelpBubbleDefaultButton(), FlushEvents())),
 
       // Step 7: Explore app window.
@@ -317,6 +318,7 @@ IN_PROC_BROWSER_TEST_F(WelcomeTourInteractiveUiTest, WelcomeTour) {
                           CheckBrowserIsForWebApp(web_app::kHelpAppId))));
 }
 
+// An interactive UI test that locks the screen during the Welcome Tour.
 IN_PROC_BROWSER_TEST_F(WelcomeTourInteractiveUiTest,
                        LockScreenDuringWelcomeTour) {
   RunTestSequence(