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

Side by Side Diff: ash/wm/gestures/overview_gesture_handler_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ash/wm/overview/window_selector_controller.h" 8 #include "ash/wm/overview/window_selector_controller.h"
9 #include "ui/aura/test/test_window_delegate.h" 9 #include "ui/aura/test/test_window_delegate.h"
10 #include "ui/aura/test/test_windows.h" 10 #include "ui/aura/test/test_windows.h"
(...skipping 22 matching lines...) Expand all
33 aura::test::TestWindowDelegate delegate_; 33 aura::test::TestWindowDelegate delegate_;
34 34
35 DISALLOW_COPY_AND_ASSIGN(OverviewGestureHandlerTest); 35 DISALLOW_COPY_AND_ASSIGN(OverviewGestureHandlerTest);
36 }; 36 };
37 37
38 // Tests a swipe up with three fingers to enter and a swipe down to exit 38 // Tests a swipe up with three fingers to enter and a swipe down to exit
39 // overview. 39 // overview.
40 TEST_F(OverviewGestureHandlerTest, VerticalSwipes) { 40 TEST_F(OverviewGestureHandlerTest, VerticalSwipes) {
41 gfx::Rect bounds(0, 0, 400, 400); 41 gfx::Rect bounds(0, 0, 400, 400);
42 aura::Window* root_window = Shell::GetPrimaryRootWindow(); 42 aura::Window* root_window = Shell::GetPrimaryRootWindow();
43 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); 43 std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
44 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); 44 std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
45 ui::test::EventGenerator generator(root_window, root_window); 45 ui::test::EventGenerator generator(root_window, root_window);
46 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5), 46 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
47 0, -500, 100, 3); 47 0, -500, 100, 3);
48 EXPECT_TRUE(IsSelecting()); 48 EXPECT_TRUE(IsSelecting());
49 49
50 // Swiping up again does nothing. 50 // Swiping up again does nothing.
51 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5), 51 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
52 0, -500, 100, 3); 52 0, -500, 100, 3);
53 EXPECT_TRUE(IsSelecting()); 53 EXPECT_TRUE(IsSelecting());
54 54
55 // Swiping down exits. 55 // Swiping down exits.
56 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5), 56 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
57 0, 500, 100, 3); 57 0, 500, 100, 3);
58 EXPECT_FALSE(IsSelecting()); 58 EXPECT_FALSE(IsSelecting());
59 59
60 // Swiping down again does nothing. 60 // Swiping down again does nothing.
61 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5), 61 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
62 0, 500, 100, 3); 62 0, 500, 100, 3);
63 EXPECT_FALSE(IsSelecting()); 63 EXPECT_FALSE(IsSelecting());
64 } 64 }
65 65
66 // Tests that a mostly horizontal swipe does not trigger overview. 66 // Tests that a mostly horizontal swipe does not trigger overview.
67 TEST_F(OverviewGestureHandlerTest, HorizontalSwipes) { 67 TEST_F(OverviewGestureHandlerTest, HorizontalSwipes) {
68 gfx::Rect bounds(0, 0, 400, 400); 68 gfx::Rect bounds(0, 0, 400, 400);
69 aura::Window* root_window = Shell::GetPrimaryRootWindow(); 69 aura::Window* root_window = Shell::GetPrimaryRootWindow();
70 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); 70 std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
71 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); 71 std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
72 ui::test::EventGenerator generator(root_window, root_window); 72 ui::test::EventGenerator generator(root_window, root_window);
73 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5), 73 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
74 600, -500, 100, 3); 74 600, -500, 100, 3);
75 EXPECT_FALSE(IsSelecting()); 75 EXPECT_FALSE(IsSelecting());
76 76
77 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5), 77 generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
78 -600, -500, 100, 3); 78 -600, -500, 100, 3);
79 EXPECT_FALSE(IsSelecting()); 79 EXPECT_FALSE(IsSelecting());
80 } 80 }
81 81
82 // Tests a swipe up with three fingers without releasing followed by a swipe 82 // Tests a swipe up with three fingers without releasing followed by a swipe
83 // down by a lesser amount which should still be enough to exit. 83 // down by a lesser amount which should still be enough to exit.
84 TEST_F(OverviewGestureHandlerTest, SwipeUpDownWithoutReleasing) { 84 TEST_F(OverviewGestureHandlerTest, SwipeUpDownWithoutReleasing) {
85 gfx::Rect bounds(0, 0, 400, 400); 85 gfx::Rect bounds(0, 0, 400, 400);
86 aura::Window* root_window = Shell::GetPrimaryRootWindow(); 86 aura::Window* root_window = Shell::GetPrimaryRootWindow();
87 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); 87 std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
88 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); 88 std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
89 ui::test::EventGenerator generator(root_window, root_window); 89 ui::test::EventGenerator generator(root_window, root_window);
90 base::TimeDelta timestamp = base::TimeDelta::FromInternalValue( 90 base::TimeDelta timestamp = base::TimeDelta::FromInternalValue(
91 base::TimeTicks::Now().ToInternalValue()); 91 base::TimeTicks::Now().ToInternalValue());
92 gfx::Point start; 92 gfx::Point start;
93 int num_fingers = 3; 93 int num_fingers = 3;
94 base::TimeDelta step_delay(base::TimeDelta::FromMilliseconds(5)); 94 base::TimeDelta step_delay(base::TimeDelta::FromMilliseconds(5));
95 ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL, 95 ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL,
96 start, 96 start,
97 timestamp, 97 timestamp,
98 0, 98 0,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 start, 134 start,
135 timestamp, 135 timestamp,
136 0, 136 0,
137 0, 10, 137 0, 10,
138 0, 10, 138 0, 10,
139 num_fingers); 139 num_fingers);
140 generator.Dispatch(&fling_start); 140 generator.Dispatch(&fling_start);
141 } 141 }
142 142
143 } // namespace ash 143 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/gestures/long_press_affordance_handler.cc ('k') | ash/wm/gestures/shelf_gesture_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698