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

Unified Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 2303043002: Retry c7e292ea58a76fe2 - Redirect all mouse input to Alt+Tab window (Closed)
Patch Set: Created 4 years, 3 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/common/wm/window_cycle_list.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_cycle_controller_unittest.cc
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc
index f5f6edf75493417054779f3809c0fce89120993b..d183356e53b674a67f5c245bc689a9b73f110e79 100644
--- a/ash/wm/window_cycle_controller_unittest.cc
+++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -40,24 +40,32 @@ namespace ash {
namespace {
-class KeyEventCounter : public ui::EventHandler {
+class EventCounter : public ui::EventHandler {
public:
- KeyEventCounter() : key_events_(0) {}
- ~KeyEventCounter() override {}
+ EventCounter() : key_events_(0), mouse_events_(0) {}
+ ~EventCounter() override {}
- size_t GetCountAndReset() {
- size_t count = key_events_;
+ int GetKeyEventCountAndReset() {
+ int count = key_events_;
key_events_ = 0;
return count;
}
+ int GetMouseEventCountAndReset() {
+ int count = mouse_events_;
+ mouse_events_ = 0;
+ return count;
+ }
+
// ui::EventHandler:
void OnKeyEvent(ui::KeyEvent* event) override { key_events_++; }
+ void OnMouseEvent(ui::MouseEvent* event) override { mouse_events_++; }
private:
- size_t key_events_;
+ int key_events_;
+ int mouse_events_;
- DISALLOW_COPY_AND_ASSIGN(KeyEventCounter);
+ DISALLOW_COPY_AND_ASSIGN(EventCounter);
};
bool IsWindowMinimized(aura::Window* window) {
@@ -558,20 +566,71 @@ TEST_F(WindowCycleControllerTest, CycleMruPanelDestroyed) {
TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) {
std::unique_ptr<Window> w0(CreateTestWindowInShellWithId(0));
std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1));
- KeyEventCounter key_count;
- w0->AddPreTargetHandler(&key_count);
- w1->AddPreTargetHandler(&key_count);
+ EventCounter event_count;
+ w0->AddPreTargetHandler(&event_count);
+ w1->AddPreTargetHandler(&event_count);
ui::test::EventGenerator& generator = GetEventGenerator();
wm::GetWindowState(w0.get())->Activate();
generator.PressKey(ui::VKEY_MENU, ui::EF_NONE);
- EXPECT_EQ(1u, key_count.GetCountAndReset());
+ EXPECT_EQ(1, event_count.GetKeyEventCountAndReset());
generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
- EXPECT_EQ(0u, key_count.GetCountAndReset());
+ EXPECT_EQ(0, event_count.GetKeyEventCountAndReset());
generator.ReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
- EXPECT_EQ(0u, key_count.GetCountAndReset());
+ EXPECT_EQ(0, event_count.GetKeyEventCountAndReset());
generator.ReleaseKey(ui::VKEY_MENU, ui::EF_NONE);
EXPECT_TRUE(wm::GetWindowState(w1.get())->IsActive());
- EXPECT_EQ(0u, key_count.GetCountAndReset());
+ EXPECT_EQ(0, event_count.GetKeyEventCountAndReset());
+}
+
+// While the UI is active, mouse events are captured.
+TEST_F(WindowCycleControllerTest, MouseEventsCaptured) {
+ // This delegate allows the window to receive mouse events.
+ aura::test::TestWindowDelegate delegate;
+ std::unique_ptr<Window> w0(CreateTestWindowInShellWithDelegate(
+ &delegate, 0, gfx::Rect(0, 0, 100, 100)));
+ std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1));
+ EventCounter event_count;
+ w0->AddPreTargetHandler(&event_count);
+ w1->SetTargetHandler(&event_count);
+ ui::test::EventGenerator& generator = GetEventGenerator();
+ wm::ActivateWindow(w0.get());
+
+ // Events get through.
+ generator.MoveMouseToCenterOf(w0.get());
+ generator.ClickLeftButton();
+ EXPECT_LT(0, event_count.GetMouseEventCountAndReset());
+
+ // Start cycling.
+ WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+ controller->HandleCycleWindow(WindowCycleController::FORWARD);
+
+ // Events don't get through.
+ generator.ClickLeftButton();
+ EXPECT_EQ(0, event_count.GetMouseEventCountAndReset());
+
+ // Stop cycling: once again, events get through.
+ controller->StopCycling();
+ generator.ClickLeftButton();
+ EXPECT_LT(0, event_count.GetMouseEventCountAndReset());
+}
+
+// If mouse capture is lost, the UI closes.
+TEST_F(WindowCycleControllerTest, MouseCaptureLost) {
+ // This delegate allows the window to receive mouse events.
+ aura::test::TestWindowDelegate delegate;
+ std::unique_ptr<Window> w0(CreateTestWindowInShellWithDelegate(
+ &delegate, 0, gfx::Rect(0, 0, 100, 100)));
+ std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1));
+
+ // Start cycling.
+ WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+ controller->HandleCycleWindow(WindowCycleController::FORWARD);
+
+ // Some other widget grabs capture and this causes Alt+Tab to cease.
+ std::unique_ptr<views::Widget> widget = CreateTestWidget(
+ nullptr, kShellWindowId_DefaultContainer, gfx::Rect(1, 2, 3, 4));
+ widget->SetCapture(nullptr);
+ EXPECT_FALSE(controller->IsCycling());
}
// Tests that we can cycle past fullscreen windows: https://crbug.com/622396.
@@ -604,11 +663,11 @@ TEST_F(WindowCycleControllerTest, TabPastFullscreenWindow) {
// pass on the alt+tab to continue cycling). To make this test work with or
// without the new alt+tab selector we check for the event on either
// fullscreen window.
- KeyEventCounter key_count;
- w0->AddPreTargetHandler(&key_count);
- w1->AddPreTargetHandler(&key_count);
+ EventCounter event_count;
+ w0->AddPreTargetHandler(&event_count);
+ w1->AddPreTargetHandler(&event_count);
generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
- EXPECT_EQ(1u, key_count.GetCountAndReset());
+ EXPECT_EQ(1, event_count.GetKeyEventCountAndReset());
}
} // namespace ash
« no previous file with comments | « ash/common/wm/window_cycle_list.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698