Remove NOTIFICATION_EXTENSION_LOADED_DEPRECATED from c/b/ui/extensions

chrome/browser/ui/extensions/extension_installed_bubble.cc

 // Copyright 2013 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/ui/extensions/extension_installed_bubble.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 
 using content::Details;
 using extensions::Extension;
 
 namespace {
 
 // How long to wait for browser action animations to complete before retrying.
 const int kAnimationWaitMs = 50;
 // How often we retry when waiting for browser action animation to end.
 const int kAnimationWaitRetries = 10;
 
 } // namespace
 
 ExtensionInstalledBubble::ExtensionInstalledBubble(Delegate* delegate,
                                                    const Extension* extension,
-                                                   Browser *browser,
+                                                   Browser* browser,
                                                    const SkBitmap& icon)
     : delegate_(delegate),
       extension_(extension),
       browser_(browser),
       icon_(icon),
+      extension_registry_observer_(this),
       animation_wait_retries_(0),
       weak_factory_(this) {
   if (!extensions::OmniboxInfo::GetKeyword(extension).empty())
     type_ = OMNIBOX_KEYWORD;
   else if (extensions::ActionInfo::GetBrowserActionInfo(extension))
     type_ = BROWSER_ACTION;
   else if (extensions::ActionInfo::GetPageActionInfo(extension) &&
            extensions::ActionInfo::IsVerboseInstallMessage(extension))
     type_ = PAGE_ACTION;
   else
     type_ = GENERIC;
 
   // |extension| has been initialized but not loaded at this point. We need
   // to wait on showing the Bubble until not only the EXTENSION_LOADED gets
   // fired, but all of the EXTENSION_LOADED Observers have run. Only then can we
   // be sure that a BrowserAction or PageAction has had views created which we
   // can inspect for the purpose of previewing of pointing to them.
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(browser->profile()));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(browser->profile()));
+  extension_registry_observer_.Add(
+      extensions::ExtensionRegistry::Get(browser->profile()));
+
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSING,
       content::Source<Browser>(browser));
 }
 
 ExtensionInstalledBubble::~ExtensionInstalledBubble() {}
 
 void ExtensionInstalledBubble::IgnoreBrowserClosing() {
   registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING,
                     content::Source<Browser>(browser_));
 }
 
 void ExtensionInstalledBubble::ShowInternal() {
   if (delegate_->MaybeShowNow())
     return;
   if (animation_wait_retries_++ < kAnimationWaitRetries) {
     base::MessageLoopForUI::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&ExtensionInstalledBubble::ShowInternal,
                    weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(kAnimationWaitMs));
   }
 }
 
+void ExtensionInstalledBubble::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
+  if (extension == extension_) {
+    animation_wait_retries_ = 0;
+    // PostTask to ourself to allow all EXTENSION_LOADED Observers to run.
+    base::MessageLoopForUI::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&ExtensionInstalledBubble::ShowInternal,
+                   weak_factory_.GetWeakPtr()));
+  }
+}
+
+void ExtensionInstalledBubble::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionInfo::Reason reason) {
+  if (extension == extension_) {
+    // Extension is going away, make sure ShowInternal won't be called.
+    weak_factory_.InvalidateWeakPtrs();
+    extension_ = NULL;
+  }
+}
+
 void ExtensionInstalledBubble::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      const Extension* extension = Details<const Extension>(details).ptr();
-      if (extension == extension_) {
-        animation_wait_retries_ = 0;
-        // PostTask to ourself to allow all EXTENSION_LOADED Observers to run.
-        base::MessageLoopForUI::current()->PostTask(
-            FROM_HERE,
-            base::Bind(&ExtensionInstalledBubble::ShowInternal,
-                       weak_factory_.GetWeakPtr()));
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      const Extension* extension =
-          Details<extensions::UnloadedExtensionInfo>(details)->extension;
-      if (extension == extension_) {
-        // Extension is going away, make sure ShowInternal won't be called.
-        weak_factory_.InvalidateWeakPtrs();
-        extension_ = NULL;
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_BROWSER_CLOSING:
-      delete delegate_;
-      break;
-
-    default:
-      NOTREACHED() << "Received unexpected notification";
-  }
+  DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_CLOSING)
+      << "Received unexpected notification";
+  delete delegate_;
 }