Add keyboard accelerator support for in-product help

Adds support for keyboard accelerators to the FeaturePromoController +
FeaturePromoRegistry system. ui::Accelerators can't be used directly
since they are fetched from BrowserView. Instead, IPHs specify the
command ID and the correct accelerator is retrieved at runtime.

Bug: 11333016
Change-Id: I69420c3e1d753df7d67933f9a00c479b39ee963b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2468957
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Auto-Submit: Collin Baker <collinbaker@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816736}

chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h

@@ -34,9 +34,14 @@ struct FeaturePromoBubbleParams {
   base::Optional<int> screenreader_string_specifier;
 
   // A keyboard accelerator to access the feature. If
-  // |screenreader_string_specifier| is set and contains a
-  // placeholder, this is filled in.
+  // |screenreader_string_specifier| is set and contains a placeholder,
+  // this is filled in and announced to the user.
+  //
+  // One of |feature_accelerator| or |feature_command_id|, or neither,
+  // can be filled in. If |feature_command_id| is specified this ID is
+  // looked up on BrowserView and the associated accelerator is fetched.
   base::Optional<ui::Accelerator> feature_accelerator;
+  base::Optional<int> feature_command_id;
 
   // Positioning and sizing:
 

chrome/browser/ui/views/in_product_help/feature_promo_registry.cc

@@ -6,6 +6,7 @@
 
 #include "base/no_destructor.h"
 #include "base/optional.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.h"
 #include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
@@ -15,6 +16,7 @@
 #include "chrome/common/buildflags.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/feature_engagement/public/feature_constants.h"
+#include "ui/base/accelerators/accelerator.h"
 
 #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
 #include "chrome/browser/ui/views/frame/webui_tab_strip_container_view.h"
@@ -79,6 +81,20 @@ FeaturePromoRegistry::GetParamsForFeature(const base::Feature& iph_feature,
 
   FeaturePromoBubbleParams params = data_it->second.params;
   params.anchor_view = anchor_view;
+
+  if (params.feature_command_id) {
+    // Only one of the two should be specified.
+    DCHECK(!params.feature_accelerator);
+
+    int command_id = params.feature_command_id.value();
+    params.feature_command_id.reset();
+
+    // Get the actual accelerator from |browser_view|.
+    ui::Accelerator accelerator;
+    if (browser_view->GetAccelerator(command_id, &accelerator))
+      params.feature_accelerator = accelerator;
+  }
+
   return params;
 }
 
@@ -136,16 +152,7 @@ void FeaturePromoRegistry::RegisterKnownFeatures() {
     FeaturePromoBubbleParams params;
     params.body_string_specifier = IDS_REOPEN_TAB_PROMO;
     params.arrow = views::BubbleBorder::Arrow::TOP_RIGHT;
-
-    // TODO(crbug.com/1133016): re-add screenreader string. This
-    // requires some refactoring, since most accelerators are fetched
-    // from BrowserView. This is not available here.
-    //
-    // A couple implementation options:
-    // * Add another callback to fetch accelerator
-    // * Replace FeaturePromoBubbleParams::feature_accelerator with command ID;
-    //   this ID can be looked up with BrowserView::GetAccelerator() on IPH
-    //   show to get the accelerator.
+    params.feature_command_id = IDC_RESTORE_TAB;
 
     RegisterFeature(feature_engagement::kIPHReopenTabFeature, params,
                     base::BindRepeating(GetAppMenuButton));