Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Unified Diff: ash/wm/overview/window_selector_unittest.cc

Issue 2131603004: [ash-md] Makes Ctrl+W accelerator close a selected window in overview mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [ash-md] Makes Ctrl+W accelerator close a selected window in overview mode (UMA) Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 2bf45e30d47988ed1eb0bf52931965cd9fd0b9e8..af82c9d5f605d133e9cbc0220438d284cc1a9780 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -231,6 +231,14 @@ class WindowSelectorTest
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() {
@@ -1374,6 +1382,21 @@ TEST_P(WindowSelectorTest, BasicTabKeyNavigation) {
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) {
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698