Split Screen mode implementation

athena/wm/window_manager_impl.cc

Index: athena/wm/window_manager_impl.cc
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index d818416954c18b605a864f8c9779e3703c6f7fcb..3f95b48962266b8ce67f232b873eb445e1d4498a 100644
--- a/athena/wm/window_manager_impl.cc
+++ b/athena/wm/window_manager_impl.cc
@@ -8,8 +8,10 @@
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/bezel_controller.h"
+#include "athena/wm/mru_window_tracker.h"
 #include "athena/wm/public/window_manager_observer.h"
 #include "athena/wm/split_view_controller.h"
+#include "athena/wm/window_list_provider.h"
 #include "athena/wm/window_overview_mode.h"
 #include "base/logging.h"
 #include "base/observer_list.h"
@@ -34,6 +36,10 @@ class WindowManagerImpl : public WindowManager,
   // WindowManager:
   virtual void ToggleOverview() OVERRIDE;
 
+  virtual bool IsOverviewModeActive() OVERRIDE {
+    return overview_;
+  }
+
  private:
   enum Command {
     COMMAND_TOGGLE_OVERVIEW,
@@ -60,6 +66,7 @@ class WindowManagerImpl : public WindowManager,
                                   const ui::Accelerator& accelerator) OVERRIDE;
 
   scoped_ptr<aura::Window> container_;
+  scoped_ptr<MruWindowTracker> mru_window_tracker_;
   scoped_ptr<WindowOverviewMode> overview_;
   scoped_ptr<BezelController> bezel_controller_;
   scoped_ptr<SplitViewController> split_view_controller_;
@@ -95,8 +102,10 @@ WindowManagerImpl::WindowManagerImpl() {
   container_.reset(ScreenManager::Get()->CreateDefaultContainer(params));
   container_->SetLayoutManager(new AthenaContainerLayoutManager);
   container_->AddObserver(this);
+  mru_window_tracker_.reset(new MruWindowTracker(container_.get()));
   bezel_controller_.reset(new BezelController(container_.get()));
-  split_view_controller_.reset(new SplitViewController());
+  split_view_controller_.reset(new SplitViewController(
+      container_.get(), mru_window_tracker_.get(), this));
   bezel_controller_->set_left_right_delegate(split_view_controller_.get());
   container_->AddPreTargetHandler(bezel_controller_.get());
   instance = this;
@@ -138,9 +147,18 @@ void WindowManagerImpl::SetInOverview(bool active) {
     return;
 
   if (active) {
-    overview_ = WindowOverviewMode::Create(container_.get(), this);
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
                       OnOverviewModeEnter());
+    // Re-stack all windows in the order defined by mru_window_tracker_.
+    aura::Window::Windows window_list = mru_window_tracker_->GetWindowList();
+    aura::Window::Windows::iterator it;
+    for (it = window_list.begin(); it != window_list.end(); ++it) {
+      container_->StackChildAtTop(*it);
+    }
+    overview_ =
+        WindowOverviewMode::Create(container_.get(),
+                                   mru_window_tracker_->GetWindowList(),
+                                   this);
   } else {
     overview_.reset();
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
@@ -166,8 +184,7 @@ void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
 }
 
 void WindowManagerImpl::OnSelectWindow(aura::Window* window) {
-  CHECK_EQ(container_.get(), window->parent());
-  container_->StackChildAtTop(window);
+  mru_window_tracker_->MoveToFront(window);
   wm::ActivateWindow(window);
   SetInOverview(false);
 }