Change extension unload notification to indicate updates....

chrome/browser/extensions/extension_disabled_infobar_delegate.cc

 // Copyright (c) 2010 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/extensions/extension_disabled_infobar_delegate.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 52 matching lines @@
   ExtensionDisabledInfobarDelegate(TabContents* tab_contents,
                                    ExtensionService* service,
                                    const Extension* extension)
       : ConfirmInfoBarDelegate(tab_contents),
         tab_contents_(tab_contents),
         service_(service),
         extension_(extension) {
     // The user might re-enable the extension in other ways, so watch for that.
     registrar_.Add(this, NotificationType::EXTENSION_LOADED,
                    Source<Profile>(service->profile()));
-    registrar_.Add(this, NotificationType::EXTENSION_UNLOADED_DISABLED,
+    registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                    Source<Profile>(service->profile()));
   }
   virtual ~ExtensionDisabledInfobarDelegate() {
   }
   virtual string16 GetMessageText() const {
     return l10n_util::GetStringFUTF16(extension_->is_app() ?
         IDS_APP_DISABLED_INFOBAR_LABEL : IDS_EXTENSION_DISABLED_INFOBAR_LABEL,
         UTF8ToUTF16(extension_->name()));
   }
   virtual SkBitmap* GetIcon() const {
@@ skipping 15 matching lines @@
   }
   virtual void InfoBarClosed() {
     delete this;
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     // TODO(mpcomplete): RemoveInfoBar doesn't seem to always result in us
     // getting deleted.
+    const Extension* extension = NULL;
     switch (type.value) {
       case NotificationType::EXTENSION_LOADED:
-      case NotificationType::EXTENSION_UNLOADED_DISABLED: {
-        const Extension* extension = Details<const Extension>(details).ptr();
-        if (extension == extension_)
-          tab_contents_->RemoveInfoBar(this);
+        extension = Details<const Extension>(details).ptr();
+        break;
+      case NotificationType::EXTENSION_UNLOADED: {
+        UnloadedExtensionInfo* info =
+            Details<UnloadedExtensionInfo>(details).ptr();
+        if (info->reason == UnloadedExtensionInfo::DISABLE)
+          extension = info->extension;
         break;
       }
       default:
         NOTREACHED();
+        return;
     }
+    if (extension == extension_)
+      tab_contents_->RemoveInfoBar(this);
   }
 
  private:
   NotificationRegistrar registrar_;
   TabContents* tab_contents_;
   ExtensionService* service_;
   const Extension* extension_;
 };
 
 void ShowExtensionDisabledUI(ExtensionService* service, Profile* profile,
                              const Extension* extension) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
   if (!browser)
     return;
 
   TabContents* tab_contents = browser->GetSelectedTabContents();
   if (!tab_contents)
     return;
 
   tab_contents->AddInfoBar(new ExtensionDisabledInfobarDelegate(
       tab_contents, service, extension));
 }
 
 void ShowExtensionDisabledDialog(ExtensionService* service, Profile* profile,
                                  const Extension* extension) {
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(profile, service, extension);
 }