Index: athena/wm/window_manager_impl.cc |
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc |
index cbdd1e67e42aea7731a435e5fd45bb8c29660cc6..6c1bc8736f5ae28b0d180da6a4fbe75d9a93c40f 100644 |
--- a/athena/wm/window_manager_impl.cc |
+++ b/athena/wm/window_manager_impl.cc |
@@ -6,10 +6,8 @@ |
#include "athena/input/public/accelerator_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" |
@@ -31,15 +29,10 @@ |
// WindowManager: |
virtual void ToggleOverview() OVERRIDE { |
- if (overview_) { |
+ if (overview_) |
overview_.reset(); |
- FOR_EACH_OBSERVER(WindowManagerObserver, observers_, |
- OnOverviewModeExit()); |
- } else { |
+ else |
overview_ = WindowOverviewMode::Create(container_.get(), this); |
- FOR_EACH_OBSERVER(WindowManagerObserver, observers_, |
- OnOverviewModeEnter()); |
- } |
} |
private: |
@@ -56,22 +49,11 @@ |
accelerator_data, arraysize(accelerator_data), this); |
} |
- // 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 |
@@ -94,7 +76,6 @@ |
scoped_ptr<aura::Window> container_; |
scoped_ptr<WindowOverviewMode> overview_; |
- ObserverList<WindowManagerObserver> observers_; |
DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); |
}; |
@@ -175,10 +156,4 @@ |
DCHECK(!instance); |
} |
-// static |
-WindowManager* WindowManager::GetInstance() { |
- DCHECK(instance); |
- return instance; |
-} |
- |
} // namespace athena |