Kill NOTIFICATION_EXTENSION_REMOVED

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/callback_forward.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 89 matching lines @@
   virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
   virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
   virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;
   virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Callback to notify UI that extension has been removed.
+  void HandleExtensionRemoved(const Extension* extension);
+
  protected:
   ExtensionService* service_;
   const Extension* extension_;
   content::NotificationRegistrar registrar_;
+  base::WeakPtrFactory<ExternalInstallMenuAlert> weak_factory_;
+  base::Callback<void(const Extension*)> on_removed_callback_;
 };
 
 // Shows a menu item and a global error bubble, replacing the install dialog.
 class ExternalInstallGlobalError : public ExternalInstallMenuAlert {
  public:
   ExternalInstallGlobalError(ExtensionService* service,
                              const Extension* extension,
                              ExternalInstallDialogDelegate* delegate,
                              const ExtensionInstallPrompt::Prompt& prompt);
   virtual ~ExternalInstallGlobalError();
@@ skipping 98 matching lines @@
   service_weak_->UninstallExtension(extension_id_, false, NULL);
   Release();
 }
 
 // ExternalInstallMenuAlert -------------------------------------------------
 
 ExternalInstallMenuAlert::ExternalInstallMenuAlert(
     ExtensionService* service,
     const Extension* extension)
     : service_(service),
-      extension_(extension) {
+      extension_(extension),
+      weak_factory_(this) {
+  on_removed_callback_ = base::Bind(
+      &ExternalInstallMenuAlert::HandleExtensionRemoved,
+      weak_factory_.GetWeakPtr());
+  service_->RegisterExtensionRemovedCallback(on_removed_callback_);
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(service->profile()));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_REMOVED,
-                 content::Source<Profile>(service->profile()));
 }
 
 ExternalInstallMenuAlert::~ExternalInstallMenuAlert() {
 }
 
 GlobalError::Severity ExternalInstallMenuAlert::GetSeverity() {
   return SEVERITY_LOW;
 }
 
 bool ExternalInstallMenuAlert::HasMenuItem() {
@@ skipping 50 matching lines @@
 void ExternalInstallMenuAlert::BubbleViewCancelButtonPressed(
     Browser* browser) {
   NOTREACHED();
 }
 
 void ExternalInstallMenuAlert::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   // The error is invalidated if the extension has been loaded or removed.
-  DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED ||
-         type == chrome::NOTIFICATION_EXTENSION_REMOVED);
+  DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED);
   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;
 }
 
+void ExternalInstallMenuAlert::HandleExtensionRemoved(
+    const Extension* extension) {
+  if (extension != extension_)
+    return;
+  GlobalErrorService* error_service =
+      GlobalErrorServiceFactory::GetForProfile(service_->profile());
+  error_service->RemoveGlobalError(this);
+  service_->AcknowledgeExternalExtension(extension_->id());
+  service_->RemoveExtensionRemovedCallback(on_removed_callback_);

[Yoyo Zhou, 2013/08/22 16:50:26]

Likewise.

[Cait (Slow), 2013/08/26 18:01:46]

Done.

+  delete this;
+}
+
 // ExternalInstallGlobalError -----------------------------------------------
 
 ExternalInstallGlobalError::ExternalInstallGlobalError(
     ExtensionService* service,
     const Extension* extension,
     ExternalInstallDialogDelegate* delegate,
     const ExtensionInstallPrompt::Prompt& prompt)
     : ExternalInstallMenuAlert(service, extension),
       delegate_(delegate),
       prompt_(&prompt) {
@@ skipping 112 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