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

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.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: Address sky's comment. 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/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..5bcd62c5801bd805bcf51880fa2bb38284d805d2 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -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_keybinding_registry_tracker.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/extension_view_host.h"
#include "chrome/browser/extensions/tab_helper.h"
@@ -953,6 +954,10 @@ void BrowserActionsContainer::OnBrowserActionVisibilityChanged() {
owner_view_->Layout();
owner_view_->SchedulePaint();
}
+
+ if (GetWidget()->IsActive())
Devlin 2014/09/11 18:41:01 This is probably not the best point for this. Thi
David Tseng 2014/09/11 19:34:20 Done. (sky@ feel free to suggest alternatives).
+ extensions::ExtensionKeybindingRegistryTracker::Get(profile())
+ ->Update(extension_keybinding_registry_.get());
}
int BrowserActionsContainer::GetPreferredWidth() {

Powered by Google App Engine
This is Rietveld 408576698