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

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

Issue 2667293002: [ash-md] Adds support for gesture to move selection in overview mode (Closed)
Patch Set: [ash-md] Adds support for gesture to move selection in overview mode (tuning) Created 3 years, 10 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
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 f114e13f9cf07c7b1f418c1d5683ffa70e54ef3d..d4e7f653def8bde25ac359264a4caa4995c6e779 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -1624,22 +1624,22 @@ TEST_F(WindowSelectorTest, BasicTabKeyNavigation) {
GetWindowItemsForRoot(0);
SendKey(ui::VKEY_TAB);
EXPECT_EQ(GetSelectedWindow(),
- WmWindow::GetAuraWindow(overview_windows[0]->GetWindow()));
- SendKey(ui::VKEY_TAB);
- EXPECT_EQ(GetSelectedWindow(),
WmWindow::GetAuraWindow(overview_windows[1]->GetWindow()));
SendKey(ui::VKEY_TAB);
EXPECT_EQ(GetSelectedWindow(),
WmWindow::GetAuraWindow(overview_windows[0]->GetWindow()));
+ SendKey(ui::VKEY_TAB);
+ EXPECT_EQ(GetSelectedWindow(),
+ WmWindow::GetAuraWindow(overview_windows[1]->GetWindow()));
}
// Tests that pressing Ctrl+W while a window is selected in overview closes it.
TEST_F(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();
+ std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
ToggleOverview();
SendKey(ui::VKEY_RIGHT);
@@ -1664,8 +1664,8 @@ TEST_F(WindowSelectorTest, BasicArrowKeyNavigation) {
// The rows contain variable number of items making vertical navigation not
// feasible. [Down] is equivalent to [Right] and [Up] is equivalent to [Left].
int index_path_for_direction[][test_windows + 1] = {
- {1, 2, 3, 4, 5, 6, 7, 8, 9, 1}, // Right
- {1, 2, 3, 4, 5, 6, 7, 8, 9, 1}, // Down (same as Right)
+ {2, 3, 4, 5, 6, 7, 8, 9, 1, 2}, // Right
+ {2, 3, 4, 5, 6, 7, 8, 9, 1, 2}, // Down (same as Right)
{9, 8, 7, 6, 5, 4, 3, 2, 1, 9}, // Left
{9, 8, 7, 6, 5, 4, 3, 2, 1, 9} // Up (same as Left)
};
@@ -1704,9 +1704,6 @@ TEST_F(WindowSelectorTest, BasicMultiMonitorArrowKeyNavigation) {
GetWindowItemsForRoot(1);
SendKey(ui::VKEY_RIGHT);
EXPECT_EQ(GetSelectedWindow(),
- WmWindow::GetAuraWindow(overview_root1[0]->GetWindow()));
- SendKey(ui::VKEY_RIGHT);
- EXPECT_EQ(GetSelectedWindow(),
WmWindow::GetAuraWindow(overview_root1[1]->GetWindow()));
SendKey(ui::VKEY_RIGHT);
EXPECT_EQ(GetSelectedWindow(),
@@ -1714,6 +1711,9 @@ TEST_F(WindowSelectorTest, BasicMultiMonitorArrowKeyNavigation) {
SendKey(ui::VKEY_RIGHT);
EXPECT_EQ(GetSelectedWindow(),
WmWindow::GetAuraWindow(overview_root2[1]->GetWindow()));
+ SendKey(ui::VKEY_RIGHT);
+ EXPECT_EQ(GetSelectedWindow(),
+ WmWindow::GetAuraWindow(overview_root1[0]->GetWindow()));
}
// Tests first monitor when display order doesn't match left to right screen

Powered by Google App Engine
This is Rietveld 408576698