Index: athena/wm/window_manager_impl.cc |
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc |
index 589da390733ec1ecf3999c24c0b16278b8b5d35c..713b39b1baffd3203adfcd0053f992b0fb7b268a 100644 |
--- a/athena/wm/window_manager_impl.cc |
+++ b/athena/wm/window_manager_impl.cc |
@@ -5,8 +5,10 @@ |
#include "athena/wm/public/window_manager.h" |
#include "athena/screen/public/screen_manager.h" |
+#include "athena/wm/public/window_manager_observer.h" |
#include "athena/wm/window_overview_mode.h" |
#include "base/logging.h" |
+#include "base/observer_list.h" |
#include "ui/aura/layout_manager.h" |
#include "ui/aura/window.h" |
#include "ui/wm/public/window_types.h" |
@@ -25,18 +27,34 @@ class WindowManagerImpl : public WindowManager, |
// WindowManager: |
virtual void ToggleOverview() OVERRIDE { |
- if (overview_) |
+ if (overview_) { |
overview_.reset(); |
- else |
+ FOR_EACH_OBSERVER(WindowManagerObserver, observers_, |
+ OnOverviewModeExit()); |
+ } else { |
overview_ = WindowOverviewMode::Create(container_.get(), this); |
+ FOR_EACH_OBSERVER(WindowManagerObserver, observers_, |
+ OnOverviewModeEnter()); |
+ } |
} |
private: |
+ // WindowManager: |
+ virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE { |
+ observers_.AddObserver(observer); |
+ } |
+ |
+ virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE { |
+ observers_.RemoveObserver(observer); |
+ } |
+ |
// WindowOverviewModeDelegate: |
virtual void OnSelectWindow(aura::Window* window) OVERRIDE { |
CHECK_EQ(container_.get(), window->parent()); |
container_->StackChildAtTop(window); |
overview_.reset(); |
+ FOR_EACH_OBSERVER(WindowManagerObserver, observers_, |
+ OnOverviewModeExit()); |
} |
// aura::WindowObserver |
@@ -48,6 +66,7 @@ class WindowManagerImpl : public WindowManager, |
scoped_ptr<aura::Window> container_; |
scoped_ptr<ui::EventHandler> temp_handler_; |
scoped_ptr<WindowOverviewMode> overview_; |
+ ObserverList<WindowManagerObserver> observers_; |
DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); |
}; |
@@ -148,4 +167,10 @@ void WindowManager::Shutdown() { |
DCHECK(!instance); |
} |
+// static |
+WindowManager* WindowManager::GetInstance() { |
+ DCHECK(instance); |
+ return instance; |
+} |
+ |
} // namespace athena |