[ash-md] Makes Ctrl+W accelerator close a selected window in overview mode

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/aura/wm_window_aura.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
@@ skipping 213 matching lines @@
     ui::test::EventGenerator event_generator(window->GetRootWindow(), window);
     event_generator.ClickLeftButton();
   }
 
   void SendKey(ui::KeyboardCode key) {
     ui::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
     event_generator.PressKey(key, 0);
     event_generator.ReleaseKey(key, 0);
   }
 
+  void SendCtrlKey(ui::KeyboardCode key) {
+    ui::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
+    event_generator.PressKey(ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN);
+    event_generator.PressKey(key, ui::EF_CONTROL_DOWN);
+    event_generator.ReleaseKey(key, ui::EF_CONTROL_DOWN);
+    event_generator.ReleaseKey(ui::VKEY_CONTROL, ui::EF_NONE);
+  }
+
   bool IsSelecting() { return window_selector_controller()->IsSelecting(); }
 
   aura::Window* GetFocusedWindow() {
     return aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
         ->GetFocusedWindow();
   }
 
   const std::vector<WindowSelectorItem*>& GetWindowItemsForRoot(int index) {
     return window_selector()->grid_list_[index]->window_list_.get();
   }
@@ skipping 1123 matching lines @@
   EXPECT_EQ(GetSelectedWindow(),
             WmWindowAura::GetAuraWindow(overview_windows[0]->GetWindow()));
   SendKey(ui::VKEY_TAB);
   EXPECT_EQ(GetSelectedWindow(),
             WmWindowAura::GetAuraWindow(overview_windows[1]->GetWindow()));
   SendKey(ui::VKEY_TAB);
   EXPECT_EQ(GetSelectedWindow(),
             WmWindowAura::GetAuraWindow(overview_windows[0]->GetWindow()));
 }
 
+// Tests that pressing Ctrl+W while a window is selected in overview closes it.
+TEST_P(WindowSelectorTest, CloseWindowWithKey) {
+  gfx::Rect bounds(0, 0, 100, 100);
+  std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
+  std::unique_ptr<views::Widget> widget =
+      CreateWindowWidget(gfx::Rect(0, 0, 400, 400));
+  aura::Window* window1 = widget->GetNativeWindow();
+  ToggleOverview();
+
+  SendKey(ui::VKEY_RIGHT);
+  EXPECT_EQ(window1, GetSelectedWindow());
+  SendCtrlKey(ui::VKEY_W);
+  EXPECT_TRUE(widget->IsClosed());
+}
+
 // Tests traversing some windows in overview mode with the arrow keys in every
 // possible direction.
 TEST_P(WindowSelectorTest, BasicArrowKeyNavigation) {
   if (!SupportsHostWindowResize())
     return;
   const size_t test_windows = 9;
   UpdateDisplay("800x600");
   ScopedVector<aura::Window> windows;
   for (size_t i = test_windows; i > 0; i--)
     windows.push_back(CreateWindowWithId(gfx::Rect(0, 0, 100, 100), i));
@@ skipping 435 matching lines @@
       bounds.y());
   EXPECT_LE(transformed_rect.bottom(), bounds.bottom());
   EXPECT_NEAR(transformed_rect.x() - bounds.x(),
               bounds.right() - transformed_rect.right(), 1);
   EXPECT_NEAR(
       transformed_rect.y() + (int)(scale * inset) - header_height - bounds.y(),
       bounds.bottom() - transformed_rect.bottom(), 1);
 }
 
 }  // namespace ash