Allow Alt-Tab to move the focus to docked windows.

ash/wm/overview/window_selector_unittest.cc

 // Copyright 2013 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 <algorithm>
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/root_window_controller.h"
@@ skipping 268 matching lines @@
 }
 
 // Tests entering overview mode with two windows and selecting one by clicking.
 TEST_F(WindowSelectorTest, Basic) {
   gfx::Rect bounds(0, 0, 400, 400);
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
   scoped_ptr<aura::Window> panel1(CreatePanelWindow(bounds));
   scoped_ptr<aura::Window> panel2(CreatePanelWindow(bounds));
+
   EXPECT_TRUE(WindowsOverlapping(window1.get(), window2.get()));
   EXPECT_TRUE(WindowsOverlapping(panel1.get(), panel2.get()));
   wm::ActivateWindow(window2.get());
   EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
   EXPECT_EQ(window2.get(), GetFocusedWindow());
   // Hide the cursor before entering overview to test that it will be shown.
   aura::client::GetCursorClient(root_window)->HideCursor();
 
   // In overview mode the windows should no longer overlap and the text filter
   // widget should be focused.
   ToggleOverview();
   EXPECT_EQ(text_filter_widget()->GetNativeWindow(), GetFocusedWindow());
   EXPECT_FALSE(WindowsOverlapping(window1.get(), window2.get()));
   EXPECT_FALSE(WindowsOverlapping(window1.get(), panel1.get()));
   EXPECT_FALSE(WindowsOverlapping(panel1.get(), panel2.get()));
 
   // Clicking window 1 should activate it.
   ClickWindow(window1.get());
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window2.get()));
   EXPECT_EQ(window1.get(), GetFocusedWindow());
 
   // Cursor should have been unlocked.
   EXPECT_FALSE(aura::client::GetCursorClient(root_window)->IsCursorLocked());
 }
 
+// Tests entering overview mode with docked windows
+TEST_F(WindowSelectorTest, BasicWithDocked) {
+  // aura::Window* root_window = Shell::GetPrimaryRootWindow();
+  gfx::Rect bounds(300, 0, 200, 200);
+  scoped_ptr<aura::Window> window1(CreateWindow(bounds));
+  scoped_ptr<aura::Window> window2(CreateWindow(bounds));
+  scoped_ptr<aura::Window> docked1(CreateWindow(bounds));
+  scoped_ptr<aura::Window> docked2(CreateWindow(bounds));
+
+  wm::WMEvent dock_event(wm::WM_EVENT_DOCK);
+  wm::GetWindowState(docked1.get())->OnWMEvent(&dock_event);
+
+  wm::WindowState* docked_state2 = wm::GetWindowState(docked2.get());
+  docked_state2->OnWMEvent(&dock_event);
+  wm::WMEvent minimize_event(wm::WM_EVENT_MINIMIZE);
+  docked_state2->OnWMEvent(&minimize_event);
+
+  EXPECT_TRUE(WindowsOverlapping(window1.get(), window2.get()));
+  gfx::Rect docked_bounds = docked1->GetBoundsInScreen();
+
+  EXPECT_NE(bounds.ToString(), docked_bounds.ToString());
+  EXPECT_FALSE(WindowsOverlapping(window1.get(), docked1.get()));
+  EXPECT_FALSE(WindowsOverlapping(window1.get(), docked2.get()));
+  EXPECT_FALSE(docked2->IsVisible());
+
+  EXPECT_EQ(wm::WINDOW_STATE_TYPE_DOCKED,
+            wm::GetWindowState(docked1.get())->GetStateType());
+  EXPECT_EQ(wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED,
+            wm::GetWindowState(docked2.get())->GetStateType());
+
+  ToggleOverview();
+
+  EXPECT_FALSE(WindowsOverlapping(window1.get(), window2.get()));
+  // Docked windows stays the same.
+  EXPECT_EQ(docked_bounds.ToString(), docked1->GetBoundsInScreen().ToString());
+  EXPECT_FALSE(docked2->IsVisible());
+
+  // Docked window can still be activated, which will exit the overview mode.
+  ClickWindow(docked1.get());
+  EXPECT_TRUE(wm::IsActiveWindow(docked1.get()));
+  EXPECT_FALSE(
+      ash::Shell::GetInstance()->window_selector_controller()->IsSelecting());
+}
+
 // Tests selecting a window by tapping on it.
 TEST_F(WindowSelectorTest, BasicGesture) {
   gfx::Rect bounds(0, 0, 400, 400);
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
   wm::ActivateWindow(window1.get());
   EXPECT_EQ(window1.get(), GetFocusedWindow());
   ToggleOverview();
   EXPECT_EQ(text_filter_widget()->GetNativeWindow(), GetFocusedWindow());
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
@@ skipping 377 matching lines @@
     ToggleOverview();
   }
   EXPECT_NE(initial_bounds, ToEnclosingRect(
       GetTransformedTargetBounds(window.get())));
   ToggleOverview();
   EXPECT_FALSE(IsSelecting());
   EXPECT_EQ(initial_bounds, ToEnclosingRect(
       GetTransformedTargetBounds(window.get())));
 }
 
-// Tests that non-activatable windows are hidden when entering overview mode.
-TEST_F(WindowSelectorTest, NonActivatableWindowsHidden) {
-  gfx::Rect bounds(0, 0, 400, 400);
-  scoped_ptr<aura::Window> window1(CreateWindow(bounds));
-  scoped_ptr<aura::Window> window2(CreateWindow(bounds));
-  scoped_ptr<aura::Window> non_activatable_window(
-      CreateNonActivatableWindow(Shell::GetPrimaryRootWindow()->bounds()));
-  EXPECT_TRUE(non_activatable_window->IsVisible());
-  ToggleOverview();
-  EXPECT_FALSE(non_activatable_window->IsVisible());
-  ToggleOverview();
-  EXPECT_TRUE(non_activatable_window->IsVisible());
-
-  // Test that a window behind the fullscreen non-activatable window can be
-  // clicked.
-  non_activatable_window->parent()->StackChildAtTop(
-      non_activatable_window.get());
-  ToggleOverview();
-  ClickWindow(window1.get());
-  EXPECT_FALSE(IsSelecting());
-  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
-}
-
 // Tests that windows with modal child windows are transformed with the modal
 // child even though not activatable themselves.
 TEST_F(WindowSelectorTest, ModalChild) {
   gfx::Rect bounds(0, 0, 400, 400);
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> child1(CreateWindow(bounds));
   child1->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
   ::wm::AddTransientChild(window1.get(), child1.get());
   EXPECT_EQ(window1->parent(), child1->parent());
   ToggleOverview();
@@ skipping 490 matching lines @@
   // Switch to overview mode.
   ToggleOverview();
   ASSERT_TRUE(IsSelecting());
 
   // Tap should now exit overview mode.
   generator.GestureTapAt(point_in_background_page);
   EXPECT_FALSE(IsSelecting());
 }
 
 }  // namespace ash