Kill NOTIFICATION_EXTENSION_REMOVED

chrome/browser/extensions/extension_disabled_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/extension_disabled_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/extensions/image_loader.h"
@@ skipping 138 matching lines @@
 
   // ExtensionUninstallDialog::Delegate implementation.
   virtual void ExtensionUninstallAccepted() OVERRIDE;
   virtual void ExtensionUninstallCanceled() 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);
+
  private:
   ExtensionService* service_;
   const Extension* extension_;
   gfx::Image icon_;
 
   // How the user responded to the error; used for metrics.
   enum UserResponse {
     IGNORED,
     REENABLE,
     UNINSTALL,
     EXTENSION_DISABLED_UI_BUCKET_BOUNDARY
   };
   UserResponse user_response_;
 
   scoped_ptr<ExtensionUninstallDialog> uninstall_dialog_;
 
   // Menu command ID assigned for this extension's error.
   int menu_command_id_;
 
   content::NotificationRegistrar registrar_;
+  base::WeakPtrFactory<ExtensionDisabledGlobalError> weak_factory_;
+  base::Callback<void(const Extension*)> on_removed_callback_;
 };
 
 // TODO(yoz): create error at startup for disabled extensions.
 ExtensionDisabledGlobalError::ExtensionDisabledGlobalError(
     ExtensionService* service,
     const Extension* extension,
     const gfx::Image& icon)
     : service_(service),
       extension_(extension),
       icon_(icon),
       user_response_(IGNORED),
-      menu_command_id_(GetMenuCommandID()) {
+      menu_command_id_(GetMenuCommandID()),
+      weak_factory_(this) {
   if (icon_.IsEmpty()) {
     icon_ = gfx::Image(
         gfx::ImageSkiaOperations::CreateResizedImage(
             extension_->is_app() ?
                 extensions::IconsInfo::GetDefaultAppIcon() :
                 extensions::IconsInfo::GetDefaultExtensionIcon(),
             skia::ImageOperations::RESIZE_BEST,
             gfx::Size(kIconSize, kIconSize)));
   }
+  on_removed_callback_ = base::Bind(
+      &ExtensionDisabledGlobalError::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()));
 }
 
 ExtensionDisabledGlobalError::~ExtensionDisabledGlobalError() {
   ReleaseMenuCommandID(menu_command_id_);
   UMA_HISTOGRAM_ENUMERATION("Extensions.DisabledUIUserResponse",
                             user_response_,
                             EXTENSION_DISABLED_UI_BUCKET_BOUNDARY);
 }
 
 GlobalError::Severity ExtensionDisabledGlobalError::GetSeverity() {
@@ skipping 86 matching lines @@
 
 void ExtensionDisabledGlobalError::ExtensionUninstallCanceled() {
   // Nothing happens, and the error is still there.
 }
 
 void ExtensionDisabledGlobalError::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;
   GlobalErrorServiceFactory::GetForProfile(service_->profile())->
       RemoveGlobalError(this);
-
-  if (type == chrome::NOTIFICATION_EXTENSION_LOADED)
-    user_response_ = REENABLE;
-  else if (type == chrome::NOTIFICATION_EXTENSION_REMOVED)
-    user_response_ = UNINSTALL;
+  user_response_ = REENABLE;
   delete this;
 }
 
+void ExtensionDisabledGlobalError::HandleExtensionRemoved(
+    const Extension* extension) {
+  if (extension != extension_)
+    return;
+  GlobalErrorServiceFactory::GetForProfile(service_->profile())->
+      RemoveGlobalError(this);
+  user_response_ = UNINSTALL;
+  service_->RemoveExtensionRemovedCallback(on_removed_callback_);

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

Seems like this should be in the destructor instead.

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

Done.

+  delete this;
+}
+
 // Globals --------------------------------------------------------------------
 
 namespace extensions {
 
 void AddExtensionDisabledErrorWithIcon(base::WeakPtr<ExtensionService> service,
                                        const std::string& extension_id,
                                        const gfx::Image& icon) {
   if (!service.get())
     return;
   const Extension* extension = service->GetInstalledExtension(extension_id);
@@ skipping 18 matching lines @@
 void ShowExtensionDisabledDialog(ExtensionService* service,
                                  content::WebContents* web_contents,
                                  const Extension* extension) {
   scoped_ptr<ExtensionInstallPrompt> install_ui(
       new ExtensionInstallPrompt(web_contents));
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(service, install_ui.Pass(), extension);
 }
 
 }  // namespace extensions