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

Side by Side Diff: ash/system/tray/system_tray_unittest.cc

Issue 2930123002: Tablet WM : Swiping on system tray bubble. (Closed)
Patch Set: Fixed comments. Created 3 years, 5 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
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/tray_event_filter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/system/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
11 #include "ash/accessibility_delegate.h" 11 #include "ash/accessibility_delegate.h"
12 #include "ash/public/cpp/shell_window_ids.h" 12 #include "ash/public/cpp/shell_window_ids.h"
13 #include "ash/root_window_controller.h" 13 #include "ash/root_window_controller.h"
14 #include "ash/shelf/shelf.h" 14 #include "ash/shelf/shelf.h"
15 #include "ash/shelf/shelf_widget.h"
15 #include "ash/shell.h" 16 #include "ash/shell.h"
16 #include "ash/system/status_area_widget.h" 17 #include "ash/system/status_area_widget.h"
17 #include "ash/system/tray/system_tray_bubble.h" 18 #include "ash/system/tray/system_tray_bubble.h"
18 #include "ash/system/tray/system_tray_item.h" 19 #include "ash/system/tray/system_tray_item.h"
19 #include "ash/system/tray/tray_constants.h" 20 #include "ash/system/tray/tray_constants.h"
20 #include "ash/system/web_notification/web_notification_tray.h" 21 #include "ash/system/web_notification/web_notification_tray.h"
21 #include "ash/test/ash_test_base.h" 22 #include "ash/test/ash_test_base.h"
22 #include "ash/test/status_area_widget_test_helper.h" 23 #include "ash/test/status_area_widget_test_helper.h"
23 #include "ash/test/test_system_tray_item.h" 24 #include "ash/test/test_system_tray_item.h"
25 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
24 #include "ash/wm/window_util.h" 26 #include "ash/wm/window_util.h"
25 #include "base/memory/ptr_util.h" 27 #include "base/memory/ptr_util.h"
26 #include "base/run_loop.h" 28 #include "base/run_loop.h"
27 #include "base/test/histogram_tester.h" 29 #include "base/test/histogram_tester.h"
28 #include "ui/base/ui_base_types.h" 30 #include "ui/base/ui_base_types.h"
29 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 31 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
30 #include "ui/events/test/event_generator.h" 32 #include "ui/events/test/event_generator.h"
31 #include "ui/gfx/geometry/point.h" 33 #include "ui/gfx/geometry/point.h"
32 #include "ui/gfx/geometry/rect.h" 34 #include "ui/gfx/geometry/rect.h"
33 #include "ui/views/controls/separator.h" 35 #include "ui/views/controls/separator.h"
(...skipping 15 matching lines...) Expand all
49 ~ModalWidgetDelegate() override {} 51 ~ModalWidgetDelegate() override {}
50 52
51 ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } 53 ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
52 54
53 private: 55 private:
54 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate); 56 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
55 }; 57 };
56 58
57 } // namespace 59 } // namespace
58 60
59 typedef AshTestBase SystemTrayTest; 61 class SystemTrayTest : public AshTestBase {
62 public:
63 SystemTrayTest() {}
64 ~SystemTrayTest() override {}
65
66 // Swiping on the system tray and ends with finger released.
67 void SendGestureEvent(gfx::Point& start,
68 float delta,
69 bool is_fling,
70 float velocity_y) {
71 SystemTray* system_tray = GetPrimarySystemTray();
72 base::TimeTicks timestamp = base::TimeTicks::Now();
73 SendScrollStartAndUpdate(start, delta, timestamp);
74
75 ui::GestureEventDetails details =
76 is_fling
77 ? ui::GestureEventDetails(ui::ET_SCROLL_FLING_START, 0, velocity_y)
78 : ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END);
79 ui::GestureEvent event = ui::GestureEvent(start.x(), start.y() + delta,
80 ui::EF_NONE, timestamp, details);
81 system_tray->OnGestureEvent(&event);
82 }
83
84 // Swiping on the system tray without releasing the finger.
85 void SendScrollStartAndUpdate(gfx::Point& start,
86 float delta,
87 base::TimeTicks& timestamp) {
88 SystemTray* system_tray = GetPrimarySystemTray();
89 ui::GestureEventDetails begin_details(ui::ET_GESTURE_SCROLL_BEGIN);
90 ui::GestureEvent begin_event = ui::GestureEvent(
91 start.x(), start.y(), ui::EF_NONE, timestamp, begin_details);
92 system_tray->OnGestureEvent(&begin_event);
93
94 ui::GestureEventDetails update_details(ui::ET_GESTURE_SCROLL_UPDATE, 0,
95 delta);
96 timestamp += base::TimeDelta::FromMilliseconds(100);
97 ui::GestureEvent update_event = ui::GestureEvent(
98 start.x(), start.y() + delta, ui::EF_NONE, timestamp, update_details);
99 system_tray->OnGestureEvent(&update_event);
100 }
101
102 // Open the default system tray bubble to get the height of the bubble and
103 // then close it.
104 float GetSystemBubbleHeight() {
105 SystemTray* system_tray = GetPrimarySystemTray();
106 system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
107 gfx::Rect bounds = GetSystemBubbleBoundsInScreen();
108 system_tray->CloseSystemBubble();
109 return bounds.height();
110 }
111
112 gfx::Rect GetSystemBubbleBoundsInScreen() {
113 return GetPrimarySystemTray()
114 ->GetSystemBubble()
115 ->bubble_view()
116 ->GetWidget()
117 ->GetWindowBoundsInScreen();
118 }
119
120 private:
121 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest);
122 };
123
124 // Swiping on the overlap area of shelf and system tray bubble during the
125 // animation should close the bubble.
126 TEST_F(SystemTrayTest, SwipingOnShelfDuringAnimation) {
127 Shelf* shelf = GetPrimaryShelf();
128 SystemTray* system_tray = GetPrimarySystemTray();
129 gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
130 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
131 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
132 true);
133
134 gfx::Rect shelf_bounds_in_screen =
135 shelf->shelf_widget()->GetWindowBoundsInScreen();
136
137 system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
138 gfx::Rect original_bounds = GetSystemBubbleBoundsInScreen();
139 system_tray->CloseSystemBubble();
140
141 // Enable animations so that we can make sure that they occur.
142 ui::ScopedAnimationDurationScaleMode regular_animations(
143 ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
144
145 ui::test::EventGenerator& generator = GetEventGenerator();
146 gfx::Point point_on_shelf_start =
147 gfx::Point(original_bounds.x() + 5, shelf_bounds_in_screen.y() + 5);
148 gfx::Point point_on_shelf_end(point_on_shelf_start.x(),
149 shelf_bounds_in_screen.bottom());
150
151 // Swiping up exceed one third of the height of the bubble should show the
152 // bubble.
153 float delta = -original_bounds.height() / 2;
154 SendGestureEvent(start, delta, false, 0);
155 EXPECT_TRUE(system_tray->HasSystemBubble());
156 gfx::Rect current_bounds = GetSystemBubbleBoundsInScreen();
157
158 // Dragging the shelf during up animation should close the bubble.
159 if (current_bounds.y() != original_bounds.y()) {
160 generator.GestureScrollSequence(point_on_shelf_start, point_on_shelf_end,
161 base::TimeDelta::FromMilliseconds(100), 5);
162 EXPECT_FALSE(system_tray->HasSystemBubble());
163 }
164
165 // Fling down on the shelf with a velocity that exceeds |kFlingVelocity|.
166 EXPECT_FALSE(system_tray->HasSystemBubble());
167 SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity + 1);
168 current_bounds = GetSystemBubbleBoundsInScreen();
169 EXPECT_TRUE(system_tray->HasSystemBubble());
170
171 // Dragging the shelf during down animation should close the bubble.
172 if (current_bounds.y() != original_bounds.y()) {
173 generator.GestureScrollSequence(point_on_shelf_start, point_on_shelf_end,
174 base::TimeDelta::FromMilliseconds(100), 5);
175 EXPECT_FALSE(system_tray->HasSystemBubble());
176 }
177 }
178
179 // Swiping on the system tray ends with fling event.
180 TEST_F(SystemTrayTest, FlingOnSystemTray) {
181 Shelf* shelf = GetPrimaryShelf();
182 SystemTray* system_tray = GetPrimarySystemTray();
183 gfx::Point start = system_tray->GetBoundsInScreen().CenterPoint();
184 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
185 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
186 true);
187
188 // Fling up on the system tray should show the bubble if the |velocity_y| is
189 // larger than |kFlingVelocity| and the dragging amount is larger than one
190 // third of the height of the bubble.
191 float delta = -GetSystemBubbleHeight();
192 SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity + 1));
193 EXPECT_TRUE(system_tray->HasSystemBubble());
194 system_tray->CloseSystemBubble();
195
196 // Fling up on the system tray should show the bubble if the |velocity_y| is
197 // larger than |kFlingVelocity| even the dragging amount is less than one
198 // third of the height of the bubble.
199 delta /= 4;
200 SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity + 1));
201 EXPECT_TRUE(system_tray->HasSystemBubble());
202 system_tray->CloseSystemBubble();
203
204 // Fling up on the system tray should show the bubble if the |velocity_y| is
205 // less than |kFlingVelocity| but the dragging amount if larger than one third
206 // of the height of the bubble.
207 delta = -GetSystemBubbleHeight();
208 SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity - 1));
209 EXPECT_TRUE(system_tray->HasSystemBubble());
210 system_tray->CloseSystemBubble();
211
212 // Fling up on the system tray should close the bubble if the |velocity_y|
213 // is less than |kFlingVelocity| and the dragging amount is less than one
214 // third of the height of the bubble.
215 delta /= 4;
216 SendGestureEvent(start, delta, true, -(SystemTray::kFlingVelocity - 1));
217 EXPECT_FALSE(system_tray->HasSystemBubble());
218
219 // Fling down on the system tray should close the bubble if the |velocity_y|
220 // is larger than kFLingVelocity.
221 SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity + 1);
222 EXPECT_FALSE(system_tray->HasSystemBubble());
223
224 // Fling down on the system tray should close the bubble if the |velocity_y|
225 // is larger than |kFlingVelocity| even the dragging amount is larger than one
226 // third of the height of the bubble.
227 delta = -GetSystemBubbleHeight();
228 SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity + 1);
229 EXPECT_FALSE(system_tray->HasSystemBubble());
230
231 // Fling down on the system tray should open the bubble if the |velocity_y| is
232 // less than |kFlingVelocity| but the dragging amount exceed one third of the
233 // height of the bubble.
234 SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity - 1);
235 EXPECT_TRUE(system_tray->HasSystemBubble());
236 system_tray->CloseSystemBubble();
237
238 // Fling down on the system tray should close the bubble if the |velocity_y|
239 // is less than |kFlingVelocity| and the dragging amount is less than one
240 // third of the height of the bubble.
241 delta /= 4;
242 SendGestureEvent(start, delta, true, SystemTray::kFlingVelocity - 1);
243 EXPECT_FALSE(system_tray->HasSystemBubble());
244 }
245
246 // Touch outside the system tray bubble during swiping should close the bubble.
247 TEST_F(SystemTrayTest, TapOutsideCloseBubble) {
248 Shelf* shelf = GetPrimaryShelf();
249 SystemTray* system_tray = GetPrimarySystemTray();
250 gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
251 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
252
253 float delta = -GetSystemBubbleHeight();
254 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
255 true);
256 base::TimeTicks timestamp = base::TimeTicks::Now();
257 SendScrollStartAndUpdate(start, delta, timestamp);
258 EXPECT_TRUE(system_tray->HasSystemBubble());
259
260 ui::test::EventGenerator& generator = GetEventGenerator();
261 gfx::Rect bounds = GetSystemBubbleBoundsInScreen();
262 gfx::Point point_outside = gfx::Point(bounds.x() - 5, bounds.y() - 5);
263 generator.GestureTapAt(point_outside);
264 EXPECT_FALSE(system_tray->HasSystemBubble());
265 }
266
267 // Swiping on the system tray ends with scroll event.
268 TEST_F(SystemTrayTest, SwipingOnSystemTray) {
269 Shelf* shelf = GetPrimaryShelf();
270 SystemTray* system_tray = GetPrimarySystemTray();
271 gfx::Point start = system_tray->GetLocalBounds().CenterPoint();
272 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
273
274 // Swiping up on the system tray has no effect if it is not in maximize mode.
275 float delta = -GetSystemBubbleHeight();
276 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
277 false);
278 EXPECT_FALSE(system_tray->HasSystemBubble());
279 SendGestureEvent(start, delta, false, 0);
280 EXPECT_FALSE(system_tray->HasSystemBubble());
281
282 // Swiping up on the system tray should show the system tray bubble if it is
283 // in maximize mode.
284 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
285 true);
286 SendGestureEvent(start, delta, false, 0);
287 EXPECT_TRUE(system_tray->HasSystemBubble());
288 system_tray->CloseSystemBubble();
289
290 // Swiping up less than one third of the bubble's height should not show the
291 // bubble.
292 delta /= 4;
293 SendGestureEvent(start, delta, false, 0);
294 EXPECT_FALSE(system_tray->HasSystemBubble());
295
296 // Swiping up more than one third of the bubble's height should show the
297 // bubble.
298 delta = -GetSystemBubbleHeight() / 2;
299 SendGestureEvent(start, delta, false, 0);
300 EXPECT_TRUE(system_tray->HasSystemBubble());
301 system_tray->CloseSystemBubble();
302
303 // Swiping up on system tray should not show the system tray bubble if the
304 // shelf is left alignment.
305 delta = -GetSystemBubbleHeight();
306 shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
307 SendGestureEvent(start, delta, false, 0);
308 EXPECT_FALSE(system_tray->HasSystemBubble());
309
310 // Swiping up on system tray should not show the system tray bubble if the
311 // shelf is right alignment.
312 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
313 SendGestureEvent(start, delta, false, 0);
314 EXPECT_FALSE(system_tray->HasSystemBubble());
315
316 // Swiping down on the shelf should not show the system tray bubble.
317 shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
318 delta = -delta;
319 SendGestureEvent(start, delta, false, 0);
320 EXPECT_FALSE(system_tray->HasSystemBubble());
321 }
60 322
61 // Verifies only the visible default views are recorded in the 323 // Verifies only the visible default views are recorded in the
62 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram. 324 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram.
63 TEST_F(SystemTrayTest, OnlyVisibleItemsRecorded) { 325 TEST_F(SystemTrayTest, OnlyVisibleItemsRecorded) {
64 SystemTray* tray = GetPrimarySystemTray(); 326 SystemTray* tray = GetPrimarySystemTray();
65 ASSERT_TRUE(tray->GetWidget()); 327 ASSERT_TRUE(tray->GetWidget());
66 328
67 TestSystemTrayItem* test_item = new TestSystemTrayItem(); 329 TestSystemTrayItem* test_item = new TestSystemTrayItem();
68 tray->AddTrayItem(base::WrapUnique(test_item)); 330 tray->AddTrayItem(base::WrapUnique(test_item));
69 331
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 848
587 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); 849 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
588 } 850 }
589 851
590 TEST_F(SystemTrayTest, SeparatorThickness) { 852 TEST_F(SystemTrayTest, SeparatorThickness) {
591 EXPECT_EQ(kSeparatorWidth, views::Separator::kThickness); 853 EXPECT_EQ(kSeparatorWidth, views::Separator::kThickness);
592 } 854 }
593 855
594 } // namespace test 856 } // namespace test
595 } // namespace ash 857 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/tray_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698