Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1058)

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.cc

Issue 553243002: Track the active ExtensionKeybindingRegistry and make it available to EventRewriter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Remove tracker class. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 573795fccd7857eeda603eeecd07b73870235446..5dbda94c696865b802e2b9e7d1467471f0dc7eba 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -14,6 +14,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/command_updater.h"
+#include "chrome/browser/extensions/extension_commands_global_registry.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/themes/theme_service.h"
@@ -271,8 +272,12 @@ void ToolbarView::Init() {
void ToolbarView::OnWidgetVisibilityChanged(views::Widget* widget,
bool visible) {
// Safe to call multiple times; the bubble will only appear once.
- if (visible)
+ if (visible) {
extension_message_bubble_factory_->MaybeShow(app_menu_);
+ extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())
Devlin 2014/09/11 21:38:13 We also need to unset this, either in ToolbarView
Devlin 2014/09/11 21:40:00 And also when activation is lost, and not necessar
David Tseng 2014/09/11 23:57:09 That's what I considered originally...but are we g
David Tseng 2014/09/11 23:57:09 Yeah, I wasn't sure about this one. Will add to On
Devlin 2014/09/12 00:10:33 Sky knows best here, so I definitely defer to him.
+ ->set_active_registry(
+ browser_actions_->extension_keybinding_registry());
+ }
}
void ToolbarView::Update(WebContents* tab) {

Powered by Google App Engine
This is Rietveld 408576698