Adding functions to the window_list_provider for accessing the activities window list

athena/wm/window_manager_unittest.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/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
@@ skipping 133 matching lines @@
 
   test::WindowManagerImplTestApi wm_api;
   aura::client::ParentWindowWithContext(
       first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   aura::client::ParentWindowWithContext(
       second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   aura::client::ParentWindowWithContext(
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
 
   // Do a two-finger swipe from the left bezel.
   ui::test::EventGenerator generator(root_window());
   const gfx::Point left_bezel_points[2] = {
       gfx::Point(2, 10), gfx::Point(4, 20),
   };
   const int kEventTimeSepration = 16;
   int width = root_window()->bounds().width();
   generator.GestureMultiFingerScroll(
       2, left_bezel_points, kEventTimeSepration, 1, width, 0);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   EXPECT_EQ(second.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
-  EXPECT_FALSE(first->IsVisible());
-  EXPECT_TRUE(second->IsVisible());
-  EXPECT_FALSE(third->IsVisible());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
   scoped_ptr<aura::Window> first(CreateWindow(&delegate));
   scoped_ptr<aura::Window> second(CreateWindow(&delegate));
   scoped_ptr<aura::Window> third(CreateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
   aura::client::ParentWindowWithContext(
       first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   aura::client::ParentWindowWithContext(
       second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   aura::client::ParentWindowWithContext(
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
 
   // Do a title-swipe from the top to switch to the previous window.
   ui::test::EventGenerator generator(root_window());
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   EXPECT_EQ(second.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
   EXPECT_TRUE(second->IsVisible());
   EXPECT_FALSE(third->IsVisible());
 
   // Performing the same gesture again will switch back to |third|.
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(third.get()));
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
   EXPECT_FALSE(second->IsVisible());
   EXPECT_TRUE(third->IsVisible());
 
   // Perform a swipe that doesn't go enough to perform the window switch.
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 90),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(third.get()));
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
   EXPECT_FALSE(second->IsVisible());
   EXPECT_TRUE(third->IsVisible());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
   scoped_ptr<aura::Window> first(CreateWindow(&delegate));
   scoped_ptr<aura::Window> second(CreateWindow(&delegate));
   scoped_ptr<aura::Window> third(CreateWindow(&delegate));
@@ skipping 24 matching lines @@
   EXPECT_EQ(fourth.get(), wm_api.GetSplitViewController()->right_window());
 
   // Swipe the title of the left window. It should switch to |second|.
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(fourth.get(), wm_api.GetSplitViewController()->right_window());
   aura::Window::Windows windows =
-      wm_api.GetWindowListProvider()->GetWindowList();
+      wm_api.GetWindowListProvider()->GetCurrentWindowList();
   ASSERT_EQ(4u, windows.size());
   EXPECT_EQ(second.get(), windows[3]);
   EXPECT_EQ(third.get(), windows[2]);
   EXPECT_EQ(fourth.get(), windows[1]);
 
   // Swipe the title of the right window now. It should switch to |third|.
   generator.GestureScrollSequence(gfx::Point(x_middle + 20, 10),
                                   gfx::Point(x_middle + 20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
@@ skipping 89 matching lines @@
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectWindow(w1.get());
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_TRUE(w1->IsVisible());
   // Make sure the windows that were in split-view mode are hidden.
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 }
 
 }  // namespace athena