| Index: athena/wm/window_manager_unittest.cc
|
| diff --git a/athena/wm/window_manager_unittest.cc b/athena/wm/window_manager_unittest.cc
|
| index 54f22a52afbf5e056ea7e58e75cd952731250586..7c99ea4fcf8ed7220dee5eda39733fa7d45af4f4 100644
|
| --- a/athena/wm/window_manager_unittest.cc
|
| +++ b/athena/wm/window_manager_unittest.cc
|
| @@ -107,6 +107,8 @@ TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
|
| scoped_ptr<aura::Window> first(CreateWindow(&delegate));
|
| scoped_ptr<aura::Window> second(CreateWindow(&delegate));
|
| scoped_ptr<aura::Window> third(CreateWindow(&delegate));
|
| + first->Hide();
|
| + second->Hide();
|
|
|
| test::WindowManagerImplTestApi wm_api;
|
| aura::client::ParentWindowWithContext(
|
| @@ -131,6 +133,9 @@ TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
|
| 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());
|
| }
|
|
|
| TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
|
| @@ -268,16 +273,12 @@ TEST_F(WindowManagerTest, NewWindowBounds) {
|
| EXPECT_NE(work_area.ToString(),
|
| left_bounds.size().ToString());
|
|
|
| + // A new window should replace the left window when in split view.
|
| scoped_ptr<aura::Window> third(CreateWindow(&delegate));
|
| aura::client::ParentWindowWithContext(
|
| third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
|
| - EXPECT_NE(wm_api.GetSplitViewController()->left_window(), third.get());
|
| + EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
|
| EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
|
| -
|
| - third->Hide();
|
| - EXPECT_EQ(
|
| - left_bounds.ToString(),
|
| - wm_api.GetSplitViewController()->left_window()->bounds().ToString());
|
| }
|
|
|
| TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
|
|
|