Index: chrome/browser/ui/panels/panel.h |
diff --git a/chrome/browser/ui/panels/panel.h b/chrome/browser/ui/panels/panel.h |
index bd47a55c9cb4e6c39cbc8bc5ecbd7184864dd563..71394f2390854366ec0cc4612f2d565cf6303f0f 100644 |
--- a/chrome/browser/ui/panels/panel.h |
+++ b/chrome/browser/ui/panels/panel.h |
@@ -10,6 +10,7 @@ |
#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" |
@@ -17,6 +18,7 @@ |
#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" |
@@ -36,6 +38,7 @@ struct NativeWebKeyboardEvent; |
namespace extensions { |
class Extension; |
+class ExtensionRegistry; |
class WindowController; |
} |
@@ -50,7 +53,8 @@ class WindowController; |
// other Panels. For example deleting a panel would rearrange other panels. |
class Panel : public ui::BaseWindow, |
public CommandUpdaterDelegate, |
- public content::NotificationObserver { |
+ public content::NotificationObserver, |
+ public extensions::ExtensionRegistryObserver { |
public: |
enum ExpansionState { |
// The panel is fully expanded with both title-bar and the client-area. |
@@ -145,6 +149,12 @@ class Panel : public ui::BaseWindow, |
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, |
@@ -392,6 +402,11 @@ class Panel : public ui::BaseWindow, |
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_; |