OLD | NEW |
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/wm/user_activity_detector.h" | 5 #include "ash/wm/user_activity_detector.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
9 #include "ash/wm/user_activity_observer.h" | 9 #include "ash/wm/user_activity_observer.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 | 98 |
99 AdvanceTime(advance_delta); | 99 AdvanceTime(advance_delta); |
100 aura::TouchEvent touch_event( | 100 aura::TouchEvent touch_event( |
101 ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta()); | 101 ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta()); |
102 EXPECT_FALSE(detector_->PreHandleTouchEvent(window.get(), &touch_event)); | 102 EXPECT_FALSE(detector_->PreHandleTouchEvent(window.get(), &touch_event)); |
103 EXPECT_EQ(1, observer_->num_invocations()); | 103 EXPECT_EQ(1, observer_->num_invocations()); |
104 observer_->reset_stats(); | 104 observer_->reset_stats(); |
105 | 105 |
106 AdvanceTime(advance_delta); | 106 AdvanceTime(advance_delta); |
107 aura::GestureEvent gesture_event( | 107 aura::GestureEvent gesture_event( |
108 ui::ET_GESTURE_TAP, 0, 0, ui::EF_NONE, base::Time(), 0, 0, 0U); | 108 ui::ET_GESTURE_TAP, 0, 0, ui::EF_NONE, base::Time(), |
| 109 ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0, 0), 0U); |
109 EXPECT_FALSE(detector_->PreHandleGestureEvent(window.get(), &gesture_event)); | 110 EXPECT_FALSE(detector_->PreHandleGestureEvent(window.get(), &gesture_event)); |
110 EXPECT_EQ(1, observer_->num_invocations()); | 111 EXPECT_EQ(1, observer_->num_invocations()); |
111 observer_->reset_stats(); | 112 observer_->reset_stats(); |
112 } | 113 } |
113 | 114 |
114 // Checks that observers aren't notified too frequently. | 115 // Checks that observers aren't notified too frequently. |
115 TEST_F(UserActivityDetectorTest, RateLimitNotifications) { | 116 TEST_F(UserActivityDetectorTest, RateLimitNotifications) { |
116 scoped_ptr<aura::Window> window( | 117 scoped_ptr<aura::Window> window( |
117 aura::test::CreateTestWindowWithId(12345, NULL)); | 118 aura::test::CreateTestWindowWithId(12345, NULL)); |
118 | 119 |
(...skipping 28 matching lines...) Expand all Loading... |
147 scoped_ptr<aura::Window> window( | 148 scoped_ptr<aura::Window> window( |
148 aura::test::CreateTestWindowWithId(12345, NULL)); | 149 aura::test::CreateTestWindowWithId(12345, NULL)); |
149 aura::MouseEvent mouse_event( | 150 aura::MouseEvent mouse_event( |
150 ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED); | 151 ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED); |
151 EXPECT_FALSE(detector_->PreHandleMouseEvent(window.get(), &mouse_event)); | 152 EXPECT_FALSE(detector_->PreHandleMouseEvent(window.get(), &mouse_event)); |
152 EXPECT_EQ(0, observer_->num_invocations()); | 153 EXPECT_EQ(0, observer_->num_invocations()); |
153 } | 154 } |
154 | 155 |
155 } // namespace test | 156 } // namespace test |
156 } // namespace ash | 157 } // namespace ash |
OLD | NEW |