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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 306483003: Prepare for Unified Gesture Recognizer landing in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix whitespace, disable UGR. Created 6 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 | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index 3e0024a986d745dc56db7f99ba8b56ad7ef105b6..3a38fc0563f1e492d9b0e8e5cc8cba284910b170 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -391,6 +391,8 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
widget->Show();
widget->Maximize();
+ const base::TimeDelta kTimeDelta = base::TimeDelta::FromMilliseconds(40);
+
aura::Window* window = widget->GetNativeWindow();
shelf->LayoutShelf();
@@ -417,8 +419,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
gfx::Point end = start + delta;
// Swipe down on the shelf to hide it.
- generator.GestureScrollSequenceWithCallback(start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -429,8 +434,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
GetShelfWidget()->GetWindowBoundsInScreen().ToString());
// Swipe up to show the shelf.
- generator.GestureScrollSequenceWithCallback(end, start,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ end,
+ start,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
@@ -443,8 +451,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe up again. The shelf should hide.
end = start - delta;
- generator.GestureScrollSequenceWithCallback(start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -455,8 +466,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe up yet again to show it.
end = start + delta;
- generator.GestureScrollSequenceWithCallback(end, start,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ end,
+ start,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
@@ -467,8 +481,7 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
end.set_x(start.x() - shelf_shown.width() * 3 / 10);
else if (SHELF_ALIGNMENT_RIGHT == GetShelfLayoutManager()->GetAlignment())
end.set_x(start.x() + shelf_shown.width() * 3 / 10);
- generator.GestureScrollSequence(start, end,
- base::TimeDelta::FromMilliseconds(10), 5);
+ generator.GestureScrollSequence(start, end, kTimeDelta, 5);
EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
EXPECT_EQ(bounds_shelf.ToString(), window->bounds().ToString());
@@ -477,8 +490,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe down again to hide.
end = start + delta;
- generator.GestureScrollSequenceWithCallback(start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -499,8 +515,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
else if (SHELF_ALIGNMENT_RIGHT == GetShelfLayoutManager()->GetAlignment())
extended_start.set_x(GetShelfWidget()->GetWindowBoundsInScreen().x() - 1);
end = extended_start - delta;
- generator.GestureScrollSequenceWithCallback(extended_start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ extended_start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
@@ -513,8 +532,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe down again to hide.
end = start + delta;
- generator.GestureScrollSequenceWithCallback(start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -531,10 +553,8 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
GetShelfWidget()->GetWindowBoundsInScreen().right())/2,
GetShelfWidget()->GetWindowBoundsInScreen().y() - 50);
end = outside_start + delta;
- generator.GestureScrollSequence(outside_start,
- end,
- base::TimeDelta::FromMilliseconds(10),
- kNumScrollSteps);
+ generator.GestureScrollSequence(
+ outside_start, end, kTimeDelta, kNumScrollSteps);
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
@@ -552,10 +572,8 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
else if (SHELF_ALIGNMENT_RIGHT == GetShelfLayoutManager()->GetAlignment())
below_start.set_x(GetShelfWidget()->GetWindowBoundsInScreen().right() + 1);
end = below_start - delta;
- generator.GestureScrollSequence(below_start,
- end,
- base::TimeDelta::FromMilliseconds(10),
- kNumScrollSteps);
+ generator.GestureScrollSequence(
+ below_start, end, kTimeDelta, kNumScrollSteps);
EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
EXPECT_EQ(bounds_shelf.ToString(), window->bounds().ToString());
@@ -566,8 +584,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe down again to hide.
end = start + delta;
- generator.GestureScrollSequenceWithCallback(start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -590,8 +611,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe up. This should show the shelf.
end = below_start - delta;
- generator.GestureScrollSequenceWithCallback(below_start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ below_start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -602,8 +626,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
// Swipe up again. This should hide the shelf.
- generator.GestureScrollSequenceWithCallback(below_start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ below_start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
@@ -622,8 +649,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe-up. This should not change anything.
end = start - delta;
- generator.GestureScrollSequenceWithCallback(below_start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ below_start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
@@ -643,8 +673,11 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
// Swipe-up to hide. This should have no effect because there are no visible
// windows.
end = below_start - delta;
- generator.GestureScrollSequenceWithCallback(below_start, end,
- base::TimeDelta::FromMilliseconds(10), kNumScrollSteps,
+ generator.GestureScrollSequenceWithCallback(
+ below_start,
+ end,
+ kTimeDelta,
+ kNumScrollSteps,
base::Bind(&ShelfDragCallback::ProcessScroll,
base::Unretained(&handler)));
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698