Extension Commands changed by the user now take effect immediately.

chrome/browser/ui/views/browser_action_view.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_action_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_actions_container.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_manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
@@ skipping 12 matching lines @@
       panel_(panel),
       context_menu_(NULL) {
   set_border(NULL);
   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_));
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
+                 content::Source<Profile>(
+                     panel_->profile()->GetOriginalProfile()));
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
+                 content::Source<Profile>(
+                     panel_->profile()->GetOriginalProfile()));
 }
 
 void BrowserActionButton::Destroy() {
-  if (keybinding_.get() && panel_->GetFocusManager())
-    panel_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
+  MaybeUnregisterExtensionCommand(false);
 
   if (context_menu_) {
     context_menu_->Cancel();
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   } else {
     delete this;
   }
 }
 
 void BrowserActionButton::ViewHierarchyChanged(
@@ skipping 11 matching lines @@
                          gfx::Size(Extension::kBrowserActionIconMaxSize,
                                    Extension::kBrowserActionIconMaxSize),
                          ImageLoadingTracker::DONT_CACHE);
     } else {
       // Set the icon to be the default extensions icon.
       default_icon_ = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_EXTENSIONS_FAVICON).ToSkBitmap();
       UpdateState();
     }
 
-    extensions::CommandService* command_service =
-        extensions::CommandServiceFactory::GetForProfile(
-            panel_->browser()->profile());
-    extensions::Command browser_action_command;
-    if (command_service->GetBrowserActionCommand(
-            extension_->id(),
-            extensions::CommandService::ACTIVE_ONLY,
-            &browser_action_command,
-            NULL)) {
-      keybinding_.reset(new ui::Accelerator(
-          browser_action_command.accelerator()));
-      panel_->GetFocusManager()->RegisterAccelerator(
-          *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
-    }
+    MaybeRegisterExtensionCommand();
   }
 
   MenuButton::ViewHierarchyChanged(is_add, parent, child);
 }
 
 bool BrowserActionButton::CanHandleAccelerators() const {
   // View::CanHandleAccelerators() checks to see if the view is visible before
   // allowing it to process accelerators. This is not appropriate for browser
   // actions buttons, which can be hidden inside the overflow area.
   return true;
@@ skipping 70 matching lines @@
 }
 
 GURL BrowserActionButton::GetPopupUrl() {
   int tab_id = panel_->GetCurrentTabId();
   return (tab_id < 0) ? GURL() : browser_action_->GetPopupUrl(tab_id);
 }
 
 void BrowserActionButton::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
-  DCHECK(type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED);
-  UpdateState();
-  // The browser action may have become visible/hidden so we need to make
-  // sure the state gets updated.
-  panel_->OnBrowserActionVisibilityChanged();
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED:
+      UpdateState();
+      // The browser action may have become visible/hidden so we need to make
+      // sure the state gets updated.
+      panel_->OnBrowserActionVisibilityChanged();
+      break;
+    case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED:
+    case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: {
+      std::pair<const std::string, const std::string>* payload =
+          content::Details<std::pair<const std::string, const std::string> >(
+              details).ptr();
+      if (extension_->id() == payload->first &&
+          payload->second ==
+              extension_manifest_values::kBrowserActionKeybindingEvent) {
+        if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED)
+          MaybeRegisterExtensionCommand();
+        else
+          MaybeUnregisterExtensionCommand(true);
+      }
+      break;
+    }
+    default:
+      NOTREACHED();
+      break;
+  }
 }
 
 bool BrowserActionButton::Activate() {
   if (!IsPopup())
     return true;
 
   panel_->OnBrowserActionExecuted(this);
 
   // TODO(erikkay): Run a nested modal loop while the mouse is down to
   // enable menu-like drag-select behavior.
@@ skipping 77 matching lines @@
 }
 
 void BrowserActionButton::SetButtonNotPushed() {
   SetState(views::CustomButton::BS_NORMAL);
   menu_visible_ = false;
 }
 
 BrowserActionButton::~BrowserActionButton() {
 }
 
+void BrowserActionButton::MaybeRegisterExtensionCommand() {
+  extensions::CommandService* command_service =
+      extensions::CommandServiceFactory::GetForProfile(
+          panel_->browser()->profile());
+  extensions::Command browser_action_command;
+  if (command_service->GetBrowserActionCommand(
+          extension_->id(),
+          extensions::CommandService::ACTIVE_ONLY,
+          &browser_action_command,
+          NULL)) {
+    keybinding_.reset(new ui::Accelerator(
+        browser_action_command.accelerator()));
+    panel_->GetFocusManager()->RegisterAccelerator(
+        *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
+  }
+}
+
+void BrowserActionButton::MaybeUnregisterExtensionCommand(bool only_if_active) {
+  if (!keybinding_.get() || !panel_->GetFocusManager())
+    return;
+
+  extensions::CommandService* command_service =
+      extensions::CommandServiceFactory::GetForProfile(
+          panel_->browser()->profile());
+
+  extensions::Command browser_action_command;
+  if (!only_if_active || !command_service->GetBrowserActionCommand(
+          extension_->id(),
+          extensions::CommandService::ACTIVE_ONLY,
+          &browser_action_command,
+          NULL)) {
+    panel_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
+  }
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 
 BrowserActionView::BrowserActionView(const Extension* extension,
                                      BrowserActionsContainer* panel)
     : panel_(panel) {
   button_ = new BrowserActionButton(extension, panel);
   button_->set_drag_controller(panel_);
   AddChildView(button_);
   button_->UpdateState();
@@ skipping 39 matching lines @@
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   ExtensionAction* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id >= 0)
     action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }