[Athena] Hide the windows which used to be in split view in ActivateSplitMode()

athena/wm/split_view_controller_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/split_view_controller.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/test/window_manager_impl_test_api.h"
@@ skipping 28 matching lines @@
     aura::Window::Windows list =
         api_->GetWindowListProvider()->GetWindowList();
     aura::Window* topmost = *list.rbegin();
     aura::Window* second_topmost = *(list.rbegin() + 1);
     return (topmost == controller->left_window() ||
             topmost == controller->right_window()) &&
            (second_topmost == controller->left_window() ||
             second_topmost == controller->right_window());
   }
 
+  // Returns whether only the split view windows are visible.
+  bool OnlySplitViewWindowsVisible() const {
+    SplitViewController* controller = api_->GetSplitViewController();
+    DCHECK(controller->IsSplitViewModeActive());
+    aura::Window::Windows list =
+        api_->GetWindowListProvider()->GetWindowList();
+    for (aura::Window::Windows::const_iterator it = list.begin();
+         it != list.end(); ++it) {
+      bool in_split_view = (*it == controller->left_window() ||
+                            *it == controller->right_window());
+      if (in_split_view != (*it)->IsVisible())
+        return false;
+    }
+    return true;
+  }
+
   bool IsSplitViewAllowed() const {
     return api_->GetSplitViewController()->CanScroll();
   }
 
   test::WindowManagerImplTestApi* api() {
     return api_.get();
   }
 
  private:
   scoped_ptr<test::WindowManagerImplTestApi> api_;
 
   DISALLOW_COPY_AND_ASSIGN(SplitViewControllerTest);
 };
 
 // Tests that when split mode is activated, the windows on the left and right
 // are selected correctly.
 TEST_F(SplitViewControllerTest, SplitModeActivation) {
   aura::test::TestWindowDelegate delegate;
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 6;
   for (size_t i = 0; i < kNumWindows; ++i) {
     scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
     windows.push_back(window.release());
+    windows[i]->Hide();
   }
 
+  windows[kNumWindows - 1]->Show();
+
   SplitViewController* controller = api()->GetSplitViewController();
   ASSERT_FALSE(controller->IsSplitViewModeActive());
 
   controller->ActivateSplitMode(NULL, NULL);
   ASSERT_TRUE(controller->IsSplitViewModeActive());
   // The last two windows should be on the left and right, respectively.
   EXPECT_EQ(windows[kNumWindows - 1], controller->left_window());
   EXPECT_EQ(windows[kNumWindows - 2], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 
   // Select the window that is currently on the left for the right panel. The
   // windows should switch.
   controller->ActivateSplitMode(NULL, windows[kNumWindows - 1]);
   EXPECT_EQ(windows[kNumWindows - 2], controller->left_window());
   EXPECT_EQ(windows[kNumWindows - 1], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 
   controller->ActivateSplitMode(windows[kNumWindows - 1], NULL);
   EXPECT_EQ(windows[kNumWindows - 1], controller->left_window());
   EXPECT_EQ(windows[kNumWindows - 2], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 
   // Select one of the windows behind the stacks for the right panel. The window
   // on the left should remain unchanged.
   controller->ActivateSplitMode(NULL, windows[0]);
   EXPECT_EQ(windows[kNumWindows - 1], controller->left_window());
   EXPECT_EQ(windows[0], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 
   controller->ActivateSplitMode(windows[1], NULL);
   EXPECT_EQ(windows[1], controller->left_window());
   EXPECT_EQ(windows[0], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 
   controller->ActivateSplitMode(windows[4], windows[5]);
   EXPECT_EQ(windows[4], controller->left_window());
   EXPECT_EQ(windows[5], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 
   controller->ActivateSplitMode(windows[0], NULL);
   EXPECT_EQ(windows[0], controller->left_window());
   EXPECT_EQ(windows[5], controller->right_window());
   EXPECT_TRUE(SplitViewWindowsTopmost());
+  EXPECT_TRUE(OnlySplitViewWindowsVisible());
 }
 
 TEST_F(SplitViewControllerTest, LandscapeOnly) {
   aura::test::TestWindowDelegate delegate;
   ScopedVector<aura::Window> windows;
   const int kNumWindows = 2;
   for (size_t i = 0; i < kNumWindows; ++i) {
     scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
     windows.push_back(window.release());
   }
@@ skipping 20 matching lines @@
   // Entering splitview should now be disabled now that the screen is in a
   // portrait orientation.
   EXPECT_FALSE(IsSplitViewAllowed());
 
   // Rotating back to 0 allows splitview again.
   ScreenManager::Get()->SetRotation(gfx::Display::ROTATE_0);
   EXPECT_TRUE(IsSplitViewAllowed());
 }
 
 }  // namespace athena