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

Unified Diff: ash/drag_drop/drag_drop_controller_unittest.cc

Issue 10388105: aura: Fix a couple of bug (really the same bug at two different places) for drag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 years, 7 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/drag_drop/drag_drop_controller.cc ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller_unittest.cc
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index e2ce3f418433a2a62df63581904d015c3f3bdd5e..b30d94e0215b506cdbe0c7f5dd86b604620ae2c9 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -274,17 +274,19 @@ TEST_F(DragDropControllerTest, DragDropWithZeroDragUpdates) {
generator.MoveMouseBy(0, 1);
}
+ UpdateDragData(&data);
+
generator.ReleaseLeftButton();
EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
- EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
+ EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold() + 1,
drag_drop_controller_->num_drag_updates_);
EXPECT_TRUE(drag_drop_controller_->drop_received_);
- EXPECT_EQ(0, drag_view->num_drag_enters_);
- EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
+ EXPECT_EQ(1, drag_view->num_drag_enters_);
+ EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold() + 1,
drag_view->num_drag_updates_);
- EXPECT_EQ(0, drag_view->num_drops_);
+ EXPECT_EQ(1, drag_view->num_drops_);
EXPECT_EQ(0, drag_view->num_drag_exits_);
EXPECT_TRUE(drag_view->drag_done_received_);
}
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698