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

trunk/src/chrome/browser/ui/panels/panel.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/ui/panels/panel.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/ui/panels/panel_host.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/stacked_panel_collection.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #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"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 using base::UserMetricsAction;
 using content::RenderViewHost;
@@ skipping 386 matching lines @@
   }
 }
 
 void Panel::Observe(int type,
                     const content::NotificationSource& source,
                     const content::NotificationDetails& details) {
   switch (type) {
     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;
     default:
       NOTREACHED() << "Received unexpected notification " << type;
   }
 }
 
-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);
 
   // Normally the system activates a window when the titlebar is clicked.
   // However, we prevent system activation of minimized panels, thus the
   // activation may not have occurred. Also, some OSes (Windows) will
   // activate a minimized panel on mouse-down regardless of our attempts to
   // prevent system activation. Attention state is not cleared in that case.
   // See Panel::OnActiveStateChanged().
@@ skipping 60 matching lines @@
 
   // Set up hosting for web contents.
   panel_host_.reset(new PanelHost(this, profile_));
   panel_host_->Init(url);
   content::WebContents* web_contents = GetWebContents();
   // The contents might be NULL for most of our tests.
   if (web_contents)
     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,
                  content::Source<ThemeService>(
                     ThemeServiceFactory::GetForProfile(profile_)));
 
 #if !defined(USE_AURA)
   // Keep alive for AURA has been moved to panel_view.
   // Prevent the browser process from shutting down while this window is open.
   chrome::IncrementKeepAliveCount();
@@ skipping 261 matching lines @@
       initialized_(false),
       min_size_(min_size),
       max_size_(max_size),
       max_size_policy_(DEFAULT_MAX_SIZE),
       auto_resizable_(false),
       in_preview_mode_(false),
       native_panel_(NULL),
       attention_mode_(USE_PANEL_ATTENTION),
       expansion_state_(EXPANDED),
       command_updater_(this),
-      extension_registry_observer_(this),
       image_loader_ptr_factory_(this) {
 }
 
 void Panel::OnImageLoaded(const gfx::Image& image) {
   if (!image.IsEmpty()) {
     app_icon_ = image;
     native_panel_->UpdatePanelTitleBar();
   }
 
   content::NotificationService::current()->Notify(
@@ skipping 66 matching lines @@
 // static
 void Panel::FormatTitleForDisplay(base::string16* title) {
   size_t current_index = 0;
   size_t match_index;
   while ((match_index = title->find(L'\n', current_index)) !=
          base::string16::npos) {
     title->replace(match_index, 1, base::string16());
     current_index = match_index;
   }
 }