athena: Fix switching to a window of a different size.

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 161 matching lines @@
 
   // 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.window_list_provider()->GetWindowList().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.window_list_provider()->GetWindowList().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.window_list_provider()->GetWindowList().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));
   scoped_ptr<aura::Window> fourth(CreateWindow(&delegate));
 
@@ skipping 76 matching lines @@
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   EXPECT_NE(wm_api.split_view_controller()->left_window(), third.get());
   EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
 
   third->Hide();
   EXPECT_EQ(left_bounds.ToString(),
             wm_api.split_view_controller()->left_window()->bounds().ToString());
 }
 
 }  // namespace athena