Add AcceleratorProviderFromBrowser

This change allows code outside of c/b/ui/views to access the main
AcceleratorProvider (which happens to be BrowserView on desktop
platforms).

Bug: 1041639
Change-Id: I20167475c769ba3921e20ddd0cc8419aad839edc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2399444Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805323}

chrome/browser/ui/accelerator_utils.h

@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_UI_ACCELERATOR_UTILS_H_
 #define CHROME_BROWSER_UI_ACCELERATOR_UTILS_H_
 
+class Browser;
+
 namespace ui {
 class Accelerator;
+class AcceleratorProvider;
 }
 
 namespace chrome {
@@ -14,6 +17,9 @@ namespace chrome {
 // Returns true if the given |accelerator| is currently registered by
 // Chrome.
 bool IsChromeAccelerator(const ui::Accelerator& accelerator);
+// Returns the AcceleratorProvider associated with |browser|, or nullptr
+// if one is not available.
+ui::AcceleratorProvider* AcceleratorProviderForBrowser(Browser* browser);
 
 }  // namespace chrome
 

chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm

@@ -8,6 +8,7 @@
 
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/ui/cocoa/accelerators_cocoa.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/base/accelerators/accelerator.h"
 #import "ui/base/accelerators/platform_accelerator_cocoa.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
@@ -51,4 +52,8 @@ bool IsChromeAccelerator(const ui::Accelerator& accelerator) {
   return CommandForKeyEvent(event).found();
 }
 
+ui::AcceleratorProvider* AcceleratorProviderForBrowser(Browser* browser) {
+  return BrowserView::GetBrowserViewForBrowser(browser);
+}
+
 }  // namespace chrome

chrome/browser/ui/views/accelerator_utils_aura.cc

@@ -5,6 +5,7 @@
 #include <stddef.h>
 
 #include "chrome/browser/ui/views/accelerator_table.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/base/accelerators/accelerator.h"
 
 #if defined(OS_CHROMEOS)
@@ -34,4 +35,8 @@ bool IsChromeAccelerator(const ui::Accelerator& accelerator) {
   return false;
 }
 
+ui::AcceleratorProvider* AcceleratorProviderForBrowser(Browser* browser) {
+  return BrowserView::GetBrowserViewForBrowser(browser);
+}
+
 }  // namespace chrome