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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/command_updater_delegate.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/panels/panel_constants.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "extensions/browser/extension_registry_observer.h"
 #include "ui/base/base_window.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class NativePanel;
 class PanelCollection;
 class PanelHost;
 class PanelManager;
 class Profile;
 class StackedPanelCollection;
 
 namespace content {
 class WebContents;
 struct NativeWebKeyboardEvent;
 }
 
 namespace extensions {
 class Extension;
-class ExtensionRegistry;
 class WindowController;
 }
 
 // A platform independent implementation of ui::BaseWindow for Panels.
 // This class gets the first crack at all the ui::BaseWindow calls for Panels
 // and does one or more of the following:
 // - Do nothing.  The function is not relevant to Panels.
 // - Do Panel specific platform independent processing and then invoke the
 //   function on the platform specific member. For example, restrict panel
 //   size to certain limits.
 // - Invoke an appropriate PanelManager function to do stuff that might affect
 //   other Panels. For example deleting a panel would rearrange other panels.
 class Panel : public ui::BaseWindow,
               public CommandUpdaterDelegate,
-              public content::NotificationObserver,
-              public extensions::ExtensionRegistryObserver {
+              public content::NotificationObserver {
  public:
   enum ExpansionState {
     // The panel is fully expanded with both title-bar and the client-area.
     EXPANDED,
     // The panel is shown with the title-bar only.
     TITLE_ONLY,
     // The panel is shown with 3-pixel line.
     MINIMIZED
   };
 
@@ skipping 74 matching lines @@
   // Overridden from CommandUpdaterDelegate:
   virtual void ExecuteCommandWithDisposition(
       int id,
       WindowOpenDisposition disposition) OVERRIDE;
 
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // extensions::ExtensionRegistryObserver implementation.
-  virtual void OnExtensionUnloaded(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
-
   // Construct a native panel implementation.
   static NativePanel* CreateNativePanel(Panel* panel,
                                         const gfx::Rect& bounds,
                                         bool always_on_top);
 
   NativePanel* native_panel() const { return native_panel_; }
 
   // Invoked when the native panel has detected a mouse click on the
   // panel's titlebar, minimize or restore buttons. Behavior of the
   // click may be modified as indicated by |modifier|.
@@ skipping 227 matching lines @@
   ExpansionState expansion_state_;
 
   // The CommandUpdater manages the window commands.
   CommandUpdater command_updater_;
 
   content::NotificationRegistrar registrar_;
   const SessionID session_id_;
   scoped_ptr<extensions::WindowController> extension_window_controller_;
   scoped_ptr<PanelHost> panel_host_;
 
-  // Listen to extension unloaded notification.
-  ScopedObserver<extensions::ExtensionRegistry,
-                 extensions::ExtensionRegistryObserver>
-      extension_registry_observer_;
-
   // Icon showed in the task bar.
   gfx::Image app_icon_;
 
   base::WeakPtrFactory<Panel> image_loader_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Panel);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_H_