athena: Fix overview mode for split-view mode.

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 297 matching lines @@
 
   // Toggle back to normal mode.
   generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
   generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 
   EXPECT_EQ(width, w1->bounds().width());
   EXPECT_EQ(width, w2->bounds().width());
 }
 
+TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
+  test::WindowManagerImplTestApi wm_api;
+
+  aura::test::TestWindowDelegate delegate;
+  scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
+  scoped_ptr<aura::Window> w2(CreateTestWindow(&delegate, gfx::Rect()));
+  scoped_ptr<aura::Window> w3(CreateTestWindow(&delegate, gfx::Rect()));
+
+  // Get into split-view mode, and then turn on overview mode.
+  wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL);
+  WindowManager::GetInstance()->ToggleOverview();
+  EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
+  EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());
+  EXPECT_EQ(w2.get(), wm_api.GetSplitViewController()->right_window());
+
+  WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
+  overview_delegate->OnSelectWindow(w1.get());
+  EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
+}
+
 }  // namespace athena