Change extension unload notification to indicate updates....

chrome/browser/extensions/extension_toolbar_model.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_toolbar_model.h"
 
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 
 ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service)
     : service_(service),
       prefs_(service->profile()->GetPrefs()),
       extensions_initialized_(false) {
   DCHECK(service_);
 
   registrar_.Add(this, NotificationType::EXTENSION_LOADED,
                  Source<Profile>(service_->profile()));
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  Source<Profile>(service_->profile()));
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED_DISABLED,
-                 Source<Profile>(service_->profile()));
   registrar_.Add(this, NotificationType::EXTENSIONS_READY,
                  Source<Profile>(service_->profile()));
   registrar_.Add(this,
                  NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
                  NotificationService::AllSources());
 
   visible_icon_count_ = prefs_->GetInteger(prefs::kExtensionToolbarSize);
 }
 
 ExtensionToolbarModel::~ExtensionToolbarModel() {
@@ skipping 52 matching lines @@
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   if (type == NotificationType::EXTENSIONS_READY) {
     InitializeExtensionList();
     return;
   }
 
   if (!service_->is_ready())
     return;
 
-  const Extension* extension = Details<const Extension>(details).ptr();
+  const Extension* extension = NULL;
+  if (type == NotificationType::EXTENSION_UNLOADED) {
+    extension = Details<UnloadedExtensionInfo>(details)->extension;
+  } else {
+    extension = Details<const Extension>(details).ptr();
+  }
   if (type == NotificationType::EXTENSION_LOADED) {
     // We don't want to add the same extension twice. It may have already been
     // added by EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED below, if the user
     // hides the browser action and then disables and enables the extension.
     for (size_t i = 0; i < toolitems_.size(); i++) {
       if (toolitems_[i].get() == extension)
         return;  // Already exists.
     }
     if (service_->GetBrowserActionVisibility(extension))
       AddExtension(extension);
-  } else if (type == NotificationType::EXTENSION_UNLOADED ||
-             type == NotificationType::EXTENSION_UNLOADED_DISABLED) {
+  } else if (type == NotificationType::EXTENSION_UNLOADED) {
     RemoveExtension(extension);
   } else if (type ==
              NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED) {
     if (service_->GetBrowserActionVisibility(extension))
       AddExtension(extension);
     else
       RemoveExtension(extension);
   } else {
     NOTREACHED() << "Received unexpected notification";
   }
@@ skipping 127 matching lines @@
   int incognito_index = 0, i = 0;
   for (ExtensionList::iterator iter = begin(); iter != end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled(*iter))
       ++incognito_index;
   }
   return incognito_index;
 }