GTK: Changes to Extension Commands now take effect immediately.

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.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/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 146 matching lines @@
                        G_CALLBACK(OnRealize), this);
     }
 
     registrar_.Add(
         this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
         content::Source<ExtensionAction>(extension->browser_action()));
     registrar_.Add(
         this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
         content::Source<Profile>(
             toolbar->browser()->profile()->GetOriginalProfile()));
+    registrar_.Add(
+        this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
+        content::Source<Profile>(
+        toolbar->browser()->profile()->GetOriginalProfile()));
+    registrar_.Add(
+        this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
+        content::Source<Profile>(
+        toolbar->browser()->profile()->GetOriginalProfile()));
   }
 
   ~BrowserActionButton() {
     DisconnectBrowserActionPopupAccelerator();
 
     if (tab_specific_icon_)
       g_object_unref(tab_specific_icon_);
 
     if (default_icon_)
       g_object_unref(default_icon_);
@@ skipping 12 matching lines @@
                const content::NotificationSource& source,
                const content::NotificationDetails& details) {
     switch (type) {
      case chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED:
       UpdateState();
       break;
      case chrome::NOTIFICATION_EXTENSION_UNLOADED:
      case chrome::NOTIFICATION_WINDOW_CLOSED:
       DisconnectBrowserActionPopupAccelerator();
       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 &&

[Yoyo Zhou, 2012/06/29 18:30:58]

nit: looks funny to have these comparisons be differently ordered, right next to
each other

+          payload->second ==
+              extension_manifest_values::kBrowserActionKeybindingEvent) {
+        if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED)
+          ConnectBrowserActionPopupAccelerator();
+        else
+          DisconnectBrowserActionPopupAccelerator();
+      }
+      break;
+     }
      default:
       NOTREACHED();
       break;
     }
   }
 
   // ImageLoadingTracker::Observer implementation.
   void OnImageLoaded(const gfx::Image& image,
                      const std::string& extension_id,
                      int index) OVERRIDE {
@@ skipping 216 matching lines @@
       gfx::NativeWindow window =
           toolbar_->browser()->window()->GetNativeWindow();
       gtk_accel_group_disconnect_key(
           accel_group_,
           keybinding_.get()->GetGdkKeyCode(),
           static_cast<GdkModifierType>(keybinding_.get()->modifiers()));
       gtk_window_remove_accel_group(window, accel_group_);
       g_object_unref(accel_group_);
       accel_group_ = NULL;
       keybinding_.reset(NULL);
+
+      // We've removed the accelerator, so no need to listen to this anymore.
+      registrar_.Remove(this,
+                        chrome::NOTIFICATION_WINDOW_CLOSED,
+                        content::Source<GtkWindow>(window));

[Finnur, 2012/06/29 14:35:38]

If we don't remove this, then double registration will occur on line 438 when we
change the shortcut in the config UI.

[Yoyo Zhou, 2012/06/29 18:30:58]

Yup.

     }
   }
 
   // The toolbar containing this button.
   BrowserActionsToolbarGtk* toolbar_;
 
   // The extension that contains this browser action.
   const Extension* extension_;
 
   // The button for this browser action.
@@ skipping 638 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }