Revert 284725 "Use ExtensionRegistryObserver instead of DEPRECAT..."

trunk/src/chrome/browser/ui/panels/panel.cc

Index: trunk/src/chrome/browser/ui/panels/panel.cc
===================================================================
--- trunk/src/chrome/browser/ui/panels/panel.cc	(revision 284768)
+++ trunk/src/chrome/browser/ui/panels/panel.cc	(working copy)
@@ -33,7 +33,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/common/constants.h"
@@ -440,6 +439,11 @@
     case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED:
       ConfigureAutoResize(content::Source<content::WebContents>(source).ptr());
       break;
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
+      if (content::Details<extensions::UnloadedExtensionInfo>(
+              details)->extension->id() == extension_id())
+        Close();
+      break;
     case chrome::NOTIFICATION_APP_TERMINATING:
       Close();
       break;
@@ -448,14 +452,6 @@
   }
 }
 
-void Panel::OnExtensionUnloaded(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) {
-  if (extension->id() == extension_id())
-    Close();
-}
-
 void Panel::OnTitlebarClicked(panel::ClickModifier modifier) {
   if (collection_)
     collection_->OnPanelTitlebarClicked(this, modifier);
@@ -536,8 +532,8 @@
     native_panel_->AttachWebContents(web_contents);
 
   // Close when the extension is unloaded or the browser is exiting.
-  extension_registry_observer_.Add(
-      extensions::ExtensionRegistry::Get(profile_));
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
+                 content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
@@ -819,7 +815,6 @@
       attention_mode_(USE_PANEL_ATTENTION),
       expansion_state_(EXPANDED),
       command_updater_(this),
-      extension_registry_observer_(this),
       image_loader_ptr_factory_(this) {
 }