Experimental Extension Keybinding (first cut).

chrome/browser/ui/views/browser_actions_container.cc

 // Copyright (c) 2012 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/browser_actions_container.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/detachable_toolbar_view.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
@@ skipping 40 matching lines @@
   set_alignment(TextButton::ALIGN_CENTER);
 
   // No UpdateState() here because View hierarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
                  content::Source<ExtensionAction>(browser_action_));
 }
 
 void BrowserActionButton::Destroy() {
+  if (keybinding_.get() && panel_->GetFocusManager())
+    panel_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
+
   if (context_menu_) {
     context_menu_->Cancel();
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   } else {
     delete this;
   }
 }
 
 void BrowserActionButton::ViewHierarchyChanged(
     bool is_add, View* parent, View* child) {
   if (is_add && child == this) {
     // The Browser Action API does not allow the default icon path to be
     // changed at runtime, so we can load this now and cache it.
     std::string relative_path = browser_action_->default_icon_path();
     if (relative_path.empty())
       return;
 
     // LoadImage is not guaranteed to be synchronous, so we might see the
     // callback OnImageLoaded execute immediately. It (through UpdateState)
     // expects parent() to return the owner for this button, so this
     // function is as early as we can start this request.
     tracker_.LoadImage(extension_, extension_->GetResource(relative_path),
                        gfx::Size(Extension::kBrowserActionIconMaxSize,
                                  Extension::kBrowserActionIconMaxSize),
                        ImageLoadingTracker::DONT_CACHE);
+
+    // Iterate through all the keybindings and see if one is assigned to the
+    // browserAction.
+    const std::vector<Extension::ExtensionKeybinding>& commands =
+        extension_->keybindings();
+    for (size_t i = 0; i < commands.size(); ++i) {
+      if (commands[i].command_name() ==
+          extension_manifest_values::kBrowserActionKeybindingEvent) {
+        keybinding_.reset(new ui::Accelerator(commands[i].accelerator()));
+        panel_->GetFocusManager()->RegisterAccelerator(
+            *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
+        break;
+      }
+    }
   }
 
   MenuButton::ViewHierarchyChanged(is_add, parent, child);
 }
 
 void BrowserActionButton::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   panel_->OnBrowserActionExecuted(this, false);
 }
 
@@ skipping 143 matching lines @@
   views::View::ConvertPointToScreen(this, &screen_loc);
   if (menu_runner.RunMenuAt(GetWidget(), NULL, gfx::Rect(screen_loc, size()),
           views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
 
   SetButtonNotPushed();
   context_menu_ = NULL;
 }
 
+bool BrowserActionButton::AcceleratorPressed(
+    const ui::Accelerator& accelerator) {
+  panel_->OnBrowserActionExecuted(this, false);
+  return true;
+}
+
 void BrowserActionButton::SetButtonPushed() {
   SetState(views::CustomButton::BS_PUSHED);
   menu_visible_ = true;
 }
 
 void BrowserActionButton::SetButtonNotPushed() {
   SetState(views::CustomButton::BS_NORMAL);
   menu_visible_ = false;
 }
 
@@ skipping 68 matching lines @@
                                                  View* owner_view)
     : profile_(browser->profile()),
       browser_(browser),
       owner_view_(owner_view),
       popup_(NULL),
       popup_button_(NULL),
       model_(NULL),
       container_width_(0),
       chevron_(NULL),
       overflow_menu_(NULL),
+      extension_keybinding_registry_(browser->profile(),
+                                     owner_view->GetFocusManager()),
       suppress_chevron_(false),
       resize_amount_(0),
       animation_target_size_(0),
       drop_indicator_position_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_task_factory_(this)) {
   set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR);
 
   if (profile_->GetExtensionService()) {
     model_ = profile_->GetExtensionService()->toolbar_model();
@@ skipping 722 matching lines @@
   }
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(
     const Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
 }