Adding functions to the window_list_provider for accessing the activities window list

athena/wm/split_view_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/split_view_controller.h"
 
 #include <cmath>
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/public/window_list_provider.h"
@@ skipping 44 matching lines @@
 
 SplitViewController::~SplitViewController() {
 }
 
 bool SplitViewController::IsSplitViewModeActive() const {
   return state_ == ACTIVE;
 }
 
 void SplitViewController::ActivateSplitMode(aura::Window* left,
                                             aura::Window* right) {
-  aura::Window::Windows windows = window_list_provider_->GetWindowList();
+  aura::Window::Windows windows = window_list_provider_->GetCurrentWindowList();
   aura::Window::Windows::reverse_iterator iter = windows.rbegin();
   if (state_ == ACTIVE) {
     if (left_window_ == right)
       left_window_ = left;
     if (right_window_ == left)
       right_window_ = right;
 
     if (!left)
       left = left_window_;
     if (!right)
@@ skipping 14 matching lines @@
     iter++;
     if (right == left && iter != windows.rend()) {
       right = *iter;
       iter++;
     }
   }
 
   SetState(ACTIVE);
   if (right_window_ != right) {
     right_window_ = right;
-    container_->StackChildAtTop(right_window_);
+    // Since the |window_list_provider_| controls directly the order of windows,
+    // it needs to change the window order accordingly.
+    window_list_provider_->MoveToFront(right_window_);
   }
   if (left_window_ != left) {
     left_window_ = left;
-    container_->StackChildAtTop(left_window_);
+    // Since the |window_list_provider_| controls directly the order of windows,
+    // it needs to change the window order accordingly.
+    window_list_provider_->MoveToFront(left_window_);
   }
   UpdateLayout(true);
 }
 
 void SplitViewController::ReplaceWindow(aura::Window* window,
                                         aura::Window* replace_with) {
   CHECK(IsSplitViewModeActive());
   CHECK(replace_with);
   CHECK(window == left_window_ || window == right_window_);
   CHECK(replace_with != left_window_ && replace_with != right_window_);
 #if !defined(NDEBUG)
-  aura::Window::Windows windows = window_list_provider_->GetWindowList();
+  aura::Window::Windows windows = window_list_provider_->GetCurrentWindowList();
   DCHECK(std::find(windows.begin(), windows.end(), replace_with) !=
          windows.end());
 #endif
 
   if (window == left_window_)
     left_window_ = replace_with;
   else
     right_window_ = replace_with;
   wm::ActivateWindow(replace_with);
   UpdateLayout(false);
@@ skipping 123 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // BezelController::ScrollDelegate:
 
 void SplitViewController::ScrollBegin(BezelController::Bezel bezel,
                                       float delta) {
   if (!CanScroll())
     return;
   SetState(SCROLLING);
 
-  aura::Window::Windows windows = window_list_provider_->GetWindowList();
+  aura::Window::Windows windows = window_list_provider_->GetCurrentWindowList();
   CHECK(windows.size() >= 2);
   aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
   aura::Window* current_window = *(iter);
   CHECK(wm::IsActiveWindow(current_window));
 
   if (delta > 0) {
     right_window_ = current_window;
     left_window_ = *(iter + 1);
   } else {
     left_window_ = current_window;
@@ skipping 34 matching lines @@
 void SplitViewController::ScrollUpdate(float delta) {
   if (state_ != SCROLLING)
     return;
   UpdateSeparatorPositionFromScrollDelta(delta);
   UpdateLayout(false);
 }
 
 bool SplitViewController::CanScroll() {
   // TODO(mfomitchev): return false in full screen.
   bool result = (!IsSplitViewModeActive() &&
-                 window_list_provider_->GetWindowList().size() >= 2 &&
+                 window_list_provider_->GetCurrentWindowList().size() >= 2 &&
                  IsLandscapeOrientation(gfx::Screen::GetNativeScreen()->
                      GetDisplayNearestWindow(container_).rotation()));
   return result;
 }
 
 }  // namespace athena