shortcuts: Update shortcut descriptions

Bug: b/216049298
Change-Id: I7f188e9463d895cc63cca0e4ae939a24eabc5e42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4611868
Reviewed-by: David Padlipsky <dpad@google.com>
Commit-Queue: Jimmy Gong <jimmyxgong@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1157958}

ash/ash_strings.grd

@@ -3521,12 +3521,6 @@ Connect your device to power.
       <message name="IDS_ASH_ACCELERATOR_DESCRIPTION_BRIGHTNESS_UP" desc="Label for accelerator action - Turn brightness up.">
         Turn brightness up
       </message>
-      <message name="IDS_ASH_ACCELERATOR_DESCRIPTION_CYCLE_BACKWARD_MRU" desc="Label for accelerator action - Go through windows from the least used window.">
-        Go through windows from the least used window
-      </message>
-      <message name="IDS_ASH_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU" desc="Label for accelerator action - Go through windows from the most recently used window.">
-        Go through windows from the most recently used window
-      </message>
       <message name="IDS_ASH_ACCELERATOR_DESCRIPTION_DESKS_ACTIVATE_DESK_LEFT" desc="Label for accelerator action - Activate desk on left.">
         Activate desk on left
       </message>
@@ -4040,9 +4034,8 @@ Connect your device to power.
       <message name="IDS_BROWSER_ACCELERATOR_DESCRIPTION_ZOOM_MINUS" desc="Label for accelerator action - Zoom out on page.">
         Zoom out on page
       </message>
-      <!-- TODO(b/286268215): Translate this string -->
-      <message name="IDS_BROWSER_ACCELERATOR_DESCRIPTION_FOCUS_LOCATION" translateable="false" desc="Label for accelerator action - Focus address bar.">
-        Focus address bar
+      <message name="IDS_BROWSER_ACCELERATOR_DESCRIPTION_FOCUS_ADDRESS_BAR" desc="Label for accelerator action - Focus address bar.">
+        Focus on address bar
       </message>
       <message name="IDS_BROWSER_ACCELERATOR_DESCRIPTION_FOCUS_TOOLBAR" desc="Label for accelerator action - Select first icon to the left of address bar.">
         Select first icon to the left of address bar
@@ -4083,9 +4076,6 @@ Connect your device to power.
       <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_GO_TO_TAB_IN_RANGE" desc="Label for accelerator action - Go through tabs 1 to 8.">
         Go through tabs 1 to 8
       </message>
-      <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU" translateable="false" desc="Label for accelerator description - Switch quickly between windows.">
-        Switch quickly between windows
-      </message>
       <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_DRAG_LINK_IN_NEW_TAB" desc="Label for accelerator description - Open link in new tab.">
         Open link in new tab
       </message>
@@ -4104,8 +4094,11 @@ Connect your device to power.
       <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_OPEN_PAGE_IN_NEW_TAB" desc="Label for accelerator description - Open the website in the address bar in a new tab.">
         Open the website in the address bar in a new tab
       </message>
-      <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_BACKWARD_MRU" desc="Label for accelerator description - Cycle backwards in the most recently used window list.">
-        Cycle backwards in the most recently used window list
+      <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_BACKWARD_MRU" desc="Label for accelerator description - Cycle backward through windows.">
+        Cycle backward through windows
+      </message>
+      <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU" desc="Label for accelerator action - Cycle forward through windows.">
+        Cycle forward through windows
       </message>
       <!-- TODO(b/286268215): Translate this string -->
       <message name="IDS_AMBIENT_ACCELERATOR_DESCRIPTION_RIGHT_CLICK" translateable="false" desc="Label for accelerator description - Right-click a link.">

ash/ash_strings_grd/IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_BACKWARD_MRU.png.sha1

@@ -1 +1 @@
-0f4302bb14a0dcec4ac1bca6a68ca82e6354e9da
+d40e5a2903183d2a7a667a191700eb429a469c1c

ash/ash_strings_grd/IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU.png.sha1

@@ -0,0 +1 @@
+d40e5a2903183d2a7a667a191700eb429a469c1c

ash/ash_strings_grd/IDS_ASH_ACCELERATOR_DESCRIPTION_CYCLE_BACKWARD_MRU.png.sha1

@@ -1 +0,0 @@
-cdbb705c5f2768ec45481233a3a91e47e2369cce

ash/ash_strings_grd/IDS_ASH_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU.png.sha1

@@ -1 +0,0 @@
-cdbb705c5f2768ec45481233a3a91e47e2369cce

ash/ash_strings_grd/IDS_BROWSER_ACCELERATOR_DESCRIPTION_FOCUS_ADDRESS_BAR.png.sha1

@@ -0,0 +1 @@
+3f18ee04b1f9f051eddbfb2f1221f90b3ef64b86

ash/webui/shortcut_customization_ui/backend/accelerator_layout_table.cc

@@ -489,6 +489,10 @@ const NonConfigurableActionsMap& GetNonConfigurableActionsMap() {
                 // TODO(longbowei): Confirm if we want to keep this accelerator
                 // or remove it.
                 ui::Accelerator(ui::VKEY_RETURN, ui::EF_SHIFT_DOWN)})},
+          {NonConfigurableActions::kBrowserFocusAddressBar,
+           NonConfigurableAcceleratorDetails(
+               {ui::Accelerator(ui::VKEY_L, ui::EF_CONTROL_DOWN),
+                ui::Accelerator(ui::VKEY_D, ui::EF_ALT_DOWN)})},
           {NonConfigurableActions::kBrowserFocusSearch,
            NonConfigurableAcceleratorDetails(
                {ui::Accelerator(ui::VKEY_K, ui::EF_CONTROL_DOWN),

ash/webui/shortcut_customization_ui/backend/accelerator_layout_table.h

@@ -66,6 +66,7 @@ enum NonConfigurableActions {
   kBrowserHome,
   kBrowserShowDownloads,
   kBrowserShowHistory,
+  kBrowserFocusAddressBar,
   kBrowserFocusSearch,
   kBrowserFocusMenuBar,
   kBrowserPrint,
@@ -591,6 +592,12 @@ constexpr AcceleratorLayoutDetails kAcceleratorLayouts[] = {
      mojom::AcceleratorSubcategory::kGeneral,
      /*locked=*/true, mojom::AcceleratorLayoutStyle::kDefault,
      mojom::AcceleratorSource::kAmbient},
+    {NonConfigurableActions::kBrowserFocusAddressBar,
+     IDS_BROWSER_ACCELERATOR_DESCRIPTION_FOCUS_ADDRESS_BAR,
+     mojom::AcceleratorCategory::kBrowser,
+     mojom::AcceleratorSubcategory::kBrowserNavigation,
+     /*locked=*/true, mojom::AcceleratorLayoutStyle::kDefault,
+     mojom::AcceleratorSource::kAmbient},
     {NonConfigurableActions::kBrowserFocusSearch,
      IDS_BROWSER_ACCELERATOR_DESCRIPTION_FOCUS_SEARCH,
      mojom::AcceleratorCategory::kBrowser,
@@ -1001,7 +1008,7 @@ constexpr AcceleratorLayoutDetails kAcceleratorLayouts[] = {
 
     // Windows and Desks
     {NonConfigurableActions::kAmbientCycleForwardMRU,
-     IDS_ASH_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU,
+     IDS_AMBIENT_ACCELERATOR_DESCRIPTION_CYCLE_FORWARD_MRU,
      mojom::AcceleratorCategory::kWindowsAndDesks,
      mojom::AcceleratorSubcategory::kWindows,
      /*locked=*/true, mojom::AcceleratorLayoutStyle::kText,