Add NOTIFICATION_EXTENSION_REMOVED for Extensions removed from ExtensionService.

chrome/browser/extensions/external_install_ui.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/extensions/external_install_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 226 matching lines @@
 
 // ExternalInstallMenuAlert -------------------------------------------------
 
 ExternalInstallMenuAlert::ExternalInstallMenuAlert(
     ExtensionService* service,
     const Extension* extension)
     : service_(service),
       extension_(extension) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(service->profile()));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_REMOVED,
                  content::Source<Profile>(service->profile()));
 }
 
 ExternalInstallMenuAlert::~ExternalInstallMenuAlert() {
 }
 
 GlobalError::Severity ExternalInstallMenuAlert::GetSeverity() {
   return SEVERITY_LOW;
 }
 
@@ skipping 50 matching lines @@
 
 void ExternalInstallMenuAlert::BubbleViewCancelButtonPressed(
     Browser* browser) {
   NOTREACHED();
 }
 
 void ExternalInstallMenuAlert::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  const Extension* extension = NULL;
-  // The error is invalidated if the extension has been reloaded or unloaded.
-  if (type == chrome::NOTIFICATION_EXTENSION_LOADED) {
-    extension = content::Details<const Extension>(details).ptr();
-  } else {
-    DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNLOADED, type);
-    extensions::UnloadedExtensionInfo* info =
-        content::Details<extensions::UnloadedExtensionInfo>(details).ptr();
-    extension = info->extension;
-  }
-  if (extension == extension_) {
-    GlobalErrorService* error_service =
-        GlobalErrorServiceFactory::GetForProfile(service_->profile());
-    error_service->RemoveGlobalError(this);
-    service_->AcknowledgeExternalExtension(extension_->id());
-    delete this;
-  }
+  // The error is invalidated if the extension has been loaded or removed.
+  DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED ||
+         type == chrome::NOTIFICATION_EXTENSION_REMOVED);
+  const Extension* extension = content::Details<const Extension>(details).ptr();
+  if (extension != extension_)
+    return;
+  GlobalErrorService* error_service =
+      GlobalErrorServiceFactory::GetForProfile(service_->profile());
+  error_service->RemoveGlobalError(this);
+  service_->AcknowledgeExternalExtension(extension_->id());
+  delete this;
 }
 
 // ExternalInstallGlobalError -----------------------------------------------
 
 ExternalInstallGlobalError::ExternalInstallGlobalError(
     ExtensionService* service,
     const Extension* extension,
     ExternalInstallDialogDelegate* delegate,
     const ExtensionInstallPrompt::Prompt& prompt)
     : ExternalInstallMenuAlert(service, extension),
@@ skipping 114 matching lines @@
 
 bool HasExternalInstallBubble(ExtensionService* service) {
   GlobalErrorService* error_service =
       GlobalErrorServiceFactory::GetForProfile(service->profile());
   GlobalError* error = error_service->GetGlobalErrorByMenuItemCommandID(
       kMenuCommandId);
   return error && error->HasBubbleView();
 }
 
 }  // namespace extensions