| Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| index 5ed94f3e2f00e37eb91ffd966dbf4b2c33d79a12..da445a004e0ba6c9d9aee4d6bf0c8e18e275f914 100644
|
| --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/stl_util.h"
|
| #include "chrome/browser/extensions/extension_action_manager.h"
|
| +#include "chrome/browser/extensions/extension_commands_global_registry.h"
|
| #include "chrome/browser/extensions/extension_util.h"
|
| #include "chrome/browser/extensions/extension_view_host.h"
|
| #include "chrome/browser/extensions/tab_helper.h"
|
| @@ -269,6 +270,13 @@ void BrowserActionsContainer::ExecuteExtensionCommand(
|
| command.accelerator());
|
| }
|
|
|
| +bool BrowserActionsContainer::IsExtensionCommandRegistered(
|
| + const ui::Accelerator& accelerator) {
|
| + return extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())
|
| + ->IsAcceleratorRegistered(accelerator) ||
|
| + extension_keybinding_registry_->IsAcceleratorRegistered(accelerator);
|
| +}
|
| +
|
| bool BrowserActionsContainer::ShownInsideMenu() const {
|
| return in_overflow_mode();
|
| }
|
|
|