Make sure the Commands list correctly reflects the status of extensions right after install/uninsta…

chrome/browser/ui/webui/extensions/command_handler.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/webui/extensions/command_handler.h"
 
 #include "base/bind.h"
 #include "base/values.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_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 CommandHandler::CommandHandler() {
 }
 
 CommandHandler::~CommandHandler() {
 }
 
 void CommandHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString("extensionCommandsOverlay",
       l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_DIALOG_TITLE));
   localized_strings->SetString("extensionCommandsEmpty",
       l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_EMPTY));
   localized_strings->SetString("extensionCommandsInactive",
       l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_INACTIVE));
   localized_strings->SetString("extensionCommandsStartTyping",
       l10n_util::GetStringUTF16(IDS_EXTENSION_TYPE_SHORTCUT));
   localized_strings->SetString("ok", l10n_util::GetStringUTF16(IDS_OK));
 }
 
 void CommandHandler::RegisterMessages() {
+  Browser* browser = browser::FindBrowserWithWebContents(
+      web_ui()->GetWebContents());
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
+                 content::Source<Profile>(browser->profile()));
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,

[Yoyo Zhou, 2012/08/24 16:00:40]

You wrote install/uninstall in the CL description, but this is load/uninstall.
It should be either load/unload or install/uninstall.

[Finnur, 2012/08/27 11:46:02]

Changed to load/unload.

On 2012/08/24 16:00:40, Yoyo Zhou wrote:

+                 content::Source<Profile>(browser->profile()));
+
   web_ui()->RegisterMessageCallback("extensionCommandsRequestExtensionsData",
       base::Bind(&CommandHandler::HandleRequestExtensionsData,
       base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setShortcutHandlingSuspended",
       base::Bind(&CommandHandler::HandleSetShortcutHandlingSuspended,
       base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setExtensionCommandShortcut",
       base::Bind(&CommandHandler::HandleSetExtensionCommandShortcut,
       base::Unretained(this)));
 }
 
+void CommandHandler::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED ||
+         type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED);
+  UpdateCommandDataOnPage();
+}
+
 void CommandHandler::UpdateCommandDataOnPage() {
   DictionaryValue results;
   GetAllCommands(&results);
   web_ui()->CallJavascriptFunction(
       "ExtensionCommandsOverlay.returnExtensionsData", results);
 }
 
 void CommandHandler::HandleRequestExtensionsData(const ListValue* args) {
   UpdateCommandDataOnPage();
 }
@@ skipping 86 matching lines @@
     if (!extensions_list->empty()) {
       extension_dict->Set("commands", extensions_list.release());
       results->Append(extension_dict.release());
     }
   }
 
   commands->Set("commands", results);
 }
 
 }  // namespace extensions