Index: ash/wm/panel_layout_manager.h |
diff --git a/ash/wm/panel_layout_manager.h b/ash/wm/panel_layout_manager.h |
index 2e415210190541dbd2f3d2c4ad41f7898815d34a..1b683780a804d226840d2249b2942446bdcf0316 100644 |
--- a/ash/wm/panel_layout_manager.h |
+++ b/ash/wm/panel_layout_manager.h |
@@ -15,6 +15,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "ui/aura/client/activation_change_observer.h" |
#include "ui/aura/layout_manager.h" |
+#include "ui/aura/window_observer.h" |
namespace aura { |
class Window; |
@@ -45,6 +46,7 @@ namespace internal { |
class ASH_EXPORT PanelLayoutManager |
: public aura::LayoutManager, |
public ash::LauncherIconObserver, |
+ public aura::WindowObserver, |
public aura::client::ActivationChangeObserver { |
public: |
explicit PanelLayoutManager(aura::Window* panel_container); |
@@ -70,6 +72,11 @@ class ASH_EXPORT PanelLayoutManager |
// Overridden from ash::LauncherIconObserver |
virtual void OnLauncherIconPositionsChanged() OVERRIDE; |
+ // Overridden from aura::WindowObserver |
+ virtual void OnWindowPropertyChanged(aura::Window* window, |
+ const void* key, |
+ intptr_t old) OVERRIDE; |
+ |
// Overridden from aura::client::ActivationChangeObserver |
virtual void OnWindowActivated(aura::Window* active, |
aura::Window* old_active) OVERRIDE; |
@@ -79,6 +86,9 @@ class ASH_EXPORT PanelLayoutManager |
typedef std::list<aura::Window*> PanelList; |
+ void MinimizePanel(aura::Window* panel); |
+ void RestorePanel(aura::Window* panel); |
+ |
// Called whenever the panel layout might change. |
void Relayout(); |