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

Unified Diff: pointer_position_watcher_test.cc

Issue 6902072: wm: Update a lot of code to use structs from geometry.h. (Closed) Base URL: ssh://gitrw.chromium.org:9222/window_manager.git@master
Patch Set: move override-redirect stacking and visibility into Window Created 9 years, 8 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: pointer_position_watcher_test.cc
diff --git a/pointer_position_watcher_test.cc b/pointer_position_watcher_test.cc
index 25a7705f42c37de30816ad167e5e230ee15d0a78..be6f6b2980057b179850f00f2dd3c497a8ca09ed 100644
--- a/pointer_position_watcher_test.cc
+++ b/pointer_position_watcher_test.cc
@@ -42,9 +42,8 @@ TEST_F(PointerPositionWatcherTest, Basic) {
&event_loop,
&xconn,
NewPermanentCallback(&counter, &TestCallbackCounter::Increment),
- true, // watch_for_entering_target
- 50, 100, // x, y
- 20, 30)); // width, height
+ true, // watch_for_entering_target
+ Rect(50, 100, 20, 30)));
EXPECT_GE(watcher->timeout_id(), 0);
// Check that the callback doesn't get run and the timer stays active as
@@ -72,9 +71,8 @@ TEST_F(PointerPositionWatcherTest, Basic) {
&event_loop,
&xconn,
NewPermanentCallback(&counter, &TestCallbackCounter::Increment),
- false, // watch_for_entering_target=false
- 50, 100, // x, y
- 20, 30)); // width, height
+ false, // watch_for_entering_target=false
+ Rect(50, 100, 20, 30)));
EXPECT_GE(watcher->timeout_id(), 0);
counter.Reset();
@@ -110,8 +108,7 @@ TEST_F(PointerPositionWatcherTest, DeleteFromCallback) {
&WatcherContainer::set_watcher,
static_cast<PointerPositionWatcher*>(NULL)),
true, // watch_for_entering_target
- 0, 0, // x, y
- 10, 10)); // width, height
+ Rect(0, 0, 10, 10)));
container.watcher->TriggerTimeout();
EXPECT_TRUE(container.watcher.get() == NULL);
« no previous file with comments | « pointer_position_watcher.cc ('k') | screen_locker_handler.h » ('j') | window.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698