Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

chrome/browser/ui/views/toolbar/browser_actions_container.cc

-// 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.
 
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
@@ skipping 926 matching lines @@
   const int kImages[] = IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT);
   highlight_painter_.reset(views::Painter::CreateImageGridPainter(kImages));
 }
 
 void BrowserActionsContainer::OnBrowserActionVisibilityChanged() {
   SetVisible(!browser_action_views_.empty());
   if (owner_view_) {
     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.  This method is called when a
BrowserAction's visibility (might have) changed, but there's no guarantee that
when a window changes, a browser action will become visible/invisible.  I think
a better solution is to listen for when the widget becomes active/inactive.  If
you wanted to rely on ToolbarView (which is already a WidgetObserver) to do
that, I'd say it's fine (but I'll leave that up to sky@).

[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() {
   size_t visible_actions = GetIconCount();
   return IconCountToWidth(
       visible_actions,
       chevron_ && visible_actions < browser_action_views_.size());
 }
 
 void BrowserActionsContainer::SetChevronVisibility() {
@@ skipping 108 matching lines @@
   size_t absolute_model_size =
       model_size == -1 ? extensions.size() : model_size;
 
   // The main container will try to show |model_size| icons, but reduce if there
   // aren't enough displayable icons to do so.
   size_t main_displayed = std::min(displayable_icon_count, absolute_model_size);
   // The overflow will display the extras, if any.
   return in_overflow_mode() ?
       displayable_icon_count - main_displayed : main_displayed;
 }