Add NOTIFICATION_EXTENSION_REMOVED for Extensions removed from ExtensionService.

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/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/size.h"
 
 using extensions::Extension;
 
@@ skipping 80 matching lines @@
       "Extensions.Permissions_ReEnableAbort";
   ExtensionService::RecordPermissionMessagesHistogram(
       extension_, histogram_name.c_str());
 
   // Do nothing. The extension will remain disabled.
   Release();
 }
 
 // ExtensionDisabledGlobalError -----------------------------------------------
 
-class ExtensionDisabledGlobalError : public GlobalError,
-                                     public content::NotificationObserver,
-                                     public ExtensionUninstallDialog::Delegate {
+class ExtensionDisabledGlobalError
+    : public GlobalError,
+      public ExtensionService::DisabledExtensionObserver,
+      public ExtensionUninstallDialog::Delegate {
  public:
   ExtensionDisabledGlobalError(ExtensionService* service,
                                const Extension* extension,
                                const gfx::Image& icon);
   virtual ~ExtensionDisabledGlobalError();
 
   // GlobalError implementation.
   virtual Severity GetSeverity() OVERRIDE;
   virtual bool HasMenuItem() OVERRIDE;
   virtual int MenuItemCommandID() OVERRIDE;
   virtual string16 MenuItemLabel() OVERRIDE;
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
   virtual bool HasBubbleView() OVERRIDE;
   virtual gfx::Image GetBubbleViewIcon() OVERRIDE;
   virtual string16 GetBubbleViewTitle() OVERRIDE;
   virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
   virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
   virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
   virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
   virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;
   virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;
 
   // 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;
+  // ExtensionService::DisabledExtensionObserver implementation.
+  virtual void OnDisabledExtensionRemoved(const Extension* extension,
+                                          bool was_enabled) OVERRIDE;
 
  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_;
 };
 
 // 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()) {
   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)));
   }
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
-                 content::Source<Profile>(service->profile()));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
-                 content::Source<Profile>(service->profile()));
+  service_->AddDisabledExtensionObserver(this);
 }
 
 ExtensionDisabledGlobalError::~ExtensionDisabledGlobalError() {
   ReleaseMenuCommandID(menu_command_id_);
   UMA_HISTOGRAM_ENUMERATION("Extensions.DisabledUIUserResponse",
                             user_response_,
                             EXTENSION_DISABLED_UI_BUCKET_BOUNDARY);
+  service_->RemoveDisabledExtensionObserver(this);
 }
 
 GlobalError::Severity ExtensionDisabledGlobalError::GetSeverity() {
   return SEVERITY_LOW;
 }
 
 bool ExtensionDisabledGlobalError::HasMenuItem() {
   return true;
 }
 
@@ skipping 74 matching lines @@
 }
 
 void ExtensionDisabledGlobalError::ExtensionUninstallAccepted() {
   service_->UninstallExtension(extension_->id(), false, NULL);
 }
 
 void ExtensionDisabledGlobalError::ExtensionUninstallCanceled() {
   // Nothing happens, and the error is still there.
 }
 
-void ExtensionDisabledGlobalError::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  const Extension* extension = NULL;
+void ExtensionDisabledGlobalError::OnDisabledExtensionRemoved(
+    const Extension* extension, bool was_enabled) {
   // 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_) {
-    GlobalErrorServiceFactory::GetForProfile(service_->profile())->
-        RemoveGlobalError(this);
+  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_UNLOADED)
-      user_response_ = UNINSTALL;
-    delete this;
-  }
+  if (was_enabled)
+    user_response_ = REENABLE;
+  else
+    user_response_ = UNINSTALL;
+  delete this;
 }
 
 // Globals --------------------------------------------------------------------
 
 namespace extensions {
 
 void AddExtensionDisabledErrorWithIcon(base::WeakPtr<ExtensionService> service,
                                        const std::string& extension_id,
                                        const gfx::Image& icon) {
   if (!service.get())
@@ skipping 20 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