Remove some NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/extensions Part2

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"
 #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/scoped_observer.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/webstore_data_fetcher.h"
 #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.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/host_desktop.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_url_handler.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 "extensions/common/extension.h"
-#include "grit/chromium_strings.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_registry_observer.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"
 
 namespace extensions {
 
 namespace {
 
 // Whether the external extension can use the streamlined bubble install flow.
 bool UseBubbleInstall(const Extension* extension, bool is_new_profile) {
   return ManifestURL::UpdatesFromGallery(extension) && !is_new_profile;
 }
 
 }  // namespace
 
 static const int kMenuCommandId = IDC_EXTERNAL_EXTENSION_ALERT;
 
 class ExternalInstallGlobalError;
 
+namespace extensions {
+class ExtensionRegistry;
+}
+
 // This class is refcounted to stay alive while we try and pull webstore data.
 class ExternalInstallDialogDelegate
     : public ExtensionInstallPrompt::Delegate,
       public WebstoreDataFetcherDelegate,
       public content::NotificationObserver,
       public base::RefCountedThreadSafe<ExternalInstallDialogDelegate> {
  public:
   ExternalInstallDialogDelegate(Browser* browser,
                                 ExtensionService* service,
                                 const Extension* extension,
@@ skipping 11 matching lines @@
   virtual void InstallUIProceed() OVERRIDE;
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
   // WebstoreDataFetcherDelegate:
   virtual void OnWebstoreRequestFailure() OVERRIDE;
   virtual void OnWebstoreResponseParseSuccess(
       scoped_ptr<base::DictionaryValue> webstore_data) OVERRIDE;
   virtual void OnWebstoreResponseParseFailure(
       const std::string& error) OVERRIDE;
 
-  // NotificationObserver:
+  // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Show the install dialog to the user.
   void ShowInstallUI();
 
   // The UI for showing the install dialog when enabling.
   scoped_ptr<ExtensionInstallPrompt> install_ui_;
   scoped_ptr<ExtensionInstallPrompt::Prompt> prompt_;
 
   Browser* browser_;
   base::WeakPtr<ExtensionService> service_weak_;
   scoped_ptr<WebstoreDataFetcher> webstore_data_fetcher_;
   content::NotificationRegistrar registrar_;
   std::string extension_id_;
   bool use_global_error_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalInstallDialogDelegate);
 };
 
 // Only shows a menu item, no bubble. Clicking the menu item shows
 // an external install dialog.
 class ExternalInstallMenuAlert : public GlobalErrorWithStandardBubble,
-                                 public content::NotificationObserver {
+                                 public content::NotificationObserver,
+                                 public ExtensionRegistryObserver {
  public:
   ExternalInstallMenuAlert(ExtensionService* service,
                            const Extension* extension);
   virtual ~ExternalInstallMenuAlert();
 
   // GlobalError implementation.
   virtual Severity GetSeverity() OVERRIDE;
   virtual bool HasMenuItem() OVERRIDE;
   virtual int MenuItemCommandID() OVERRIDE;
   virtual base::string16 MenuItemLabel() OVERRIDE;
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
   virtual bool HasBubbleView() OVERRIDE;
   virtual base::string16 GetBubbleViewTitle() OVERRIDE;
   virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE;
   virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
   virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
   virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
   virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;
   virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;
 
+ protected:
+  ExtensionService* service_;
+  const Extension* extension_;
+
+ private:
+  // Delete this instance after cleaning jobs.
+  void Clean();
+
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
- protected:
-  ExtensionService* service_;
-  const Extension* extension_;
+  // ExtensionRegistryObserver implementation.
+  virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+                                 const Extension* extension) OVERRIDE;
+
   content::NotificationRegistrar registrar_;
 
- private:
+  // Listen to extension load notifications.
+  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+      extension_registry_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ExternalInstallMenuAlert);
 };
 
 // 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);
@@ skipping 169 matching lines @@
   const Extension* extension = NULL;
   if (service_weak_.get() &&
       (extension = service_weak_->GetInstalledExtension(extension_id_))) {
     service_weak_->UninstallExtension(extension_id_, false, NULL);
   }
   Release();
 }
 
 // ExternalInstallMenuAlert -------------------------------------------------
 
-ExternalInstallMenuAlert::ExternalInstallMenuAlert(
-    ExtensionService* service,
-    const Extension* extension)
+ExternalInstallMenuAlert::ExternalInstallMenuAlert(ExtensionService* service,
+                                                   const Extension* extension)
     : service_(service),
-      extension_(extension) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(service->profile()));
+      extension_(extension),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(service->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_REMOVED,
                  content::Source<Profile>(service->profile()));
 }
 
 ExternalInstallMenuAlert::~ExternalInstallMenuAlert() {
 }
 
 GlobalError::Severity ExternalInstallMenuAlert::GetSeverity() {
   return SEVERITY_LOW;
 }
@@ skipping 47 matching lines @@
 void ExternalInstallMenuAlert::BubbleViewAcceptButtonPressed(
     Browser* browser) {
   NOTREACHED();
 }
 
 void ExternalInstallMenuAlert::BubbleViewCancelButtonPressed(
     Browser* browser) {
   NOTREACHED();
 }
 
+void ExternalInstallMenuAlert::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  if (extension != extension_)

[not at google - send to devlin, 2014/04/28 16:28:11]

simpler would be to do an (extension == extension_) comparison.

[limasdf, 2014/04/28 16:32:09]

Done.

+    return;
+  Clean();
+}
+
 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_DEPRECATED ||
-         type == chrome::NOTIFICATION_EXTENSION_REMOVED);
+  DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_REMOVED);
   const Extension* extension = content::Details<const Extension>(details).ptr();
   if (extension != extension_)

[not at google - send to devlin, 2014/04/28 16:28:11]

ditto

[limasdf, 2014/04/28 16:32:09]

Done.

     return;
+  Clean();
+}
+
+void ExternalInstallMenuAlert::Clean() {
   GlobalErrorService* error_service =
       GlobalErrorServiceFactory::GetForProfile(service_->profile());
   error_service->RemoveGlobalError(this);
   service_->AcknowledgeExternalExtension(extension_->id());
   delete this;
 }
 
 // ExternalInstallGlobalError -----------------------------------------------
 
 ExternalInstallGlobalError::ExternalInstallGlobalError(
@@ skipping 120 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