Ensure that an activity is activated when overview mode is exited

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 42 matching lines @@
   ASSERT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
   EXPECT_EQ(gfx::Screen::GetNativeScreen()
                 ->GetPrimaryDisplay()
                 .work_area()
                 .size()
                 .ToString(),
             first->bounds().size().ToString());
   EXPECT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
 
-  // Tests that going into overview mode does not change the window bounds.
   WindowManager::GetInstance()->ToggleOverview();
   ASSERT_TRUE(WindowManager::GetInstance()->IsOverviewModeActive());
+
+  // |second| should no longer be active. If |second| were to stay active, it
+  // would be possible to type text into a text field in |second| and to stay
+  // in overview mode.
+  EXPECT_FALSE(wm::IsActiveWindow(first.get()));
+  EXPECT_FALSE(wm::IsActiveWindow(second.get()));
+
+  // Entering overview mode should not have changed the window bounds.
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
   EXPECT_EQ(gfx::Screen::GetNativeScreen()
                 ->GetPrimaryDisplay()
                 .work_area()
                 .size()
                 .ToString(),
             first->bounds().size().ToString());
   EXPECT_TRUE(first->IsVisible());
   EXPECT_TRUE(second->IsVisible());
 
   // Terminate overview mode. |first| should be hidden, since it's not visible
   // to the user anymore.
   WindowManager::GetInstance()->ToggleOverview();
   ASSERT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
   EXPECT_FALSE(first->IsVisible());
   EXPECT_TRUE(second->IsVisible());
+  EXPECT_TRUE(wm::IsActiveWindow(second.get()));
 }
 
 TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
   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()));
   wm::ActivateWindow(w3.get());
 
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 
   // Go into split-view mode.
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
-  overview_delegate->OnSplitViewMode(NULL, w2.get());
+  overview_delegate->OnSelectWindow(w2.get(),
+                                    WindowOverviewModeDelegate::SPLIT_LEFT);
   EXPECT_TRUE(w3->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_FALSE(w1->IsVisible());
+  EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
+}
+
+TEST_F(WindowManagerTest, NewWindowFromOverview) {
+  aura::test::TestWindowDelegate delegate;
+  scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
+  scoped_ptr<aura::Window> w2(CreateTestWindow(&delegate, gfx::Rect()));
+  wm::ActivateWindow(w2.get());
+
+  WindowManager::GetInstance()->ToggleOverview();
+  EXPECT_TRUE(w1->IsVisible());
+  EXPECT_TRUE(w2->IsVisible());
+
+  // Test that opening a new window exits overview mode. The new window could
+  // have been opened by JavaScript or by the home card.
+  scoped_ptr<aura::Window> w3(CreateTestWindow(&delegate, gfx::Rect()));
+
+  ASSERT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
+  EXPECT_TRUE(w3->IsVisible());
+  EXPECT_TRUE(wm::IsActiveWindow(w3.get()));
+  EXPECT_FALSE(w1->IsVisible());
+  EXPECT_FALSE(w2->IsVisible());
 }
 
 TEST_F(WindowManagerTest, BezelGestureToSplitViewMode) {
   aura::test::TestWindowDelegate delegate;
   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(
@@ skipping 243 matching lines @@
   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());
+  overview_delegate->OnSelectWindow(w1.get(),
+                                    WindowOverviewModeDelegate::SPLIT_NONE);
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_TRUE(w1->IsVisible());
+  EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   // Make sure the windows that were in split-view mode are hidden.
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 }
 
 }  // namespace athena