OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/chromeos/touch_exploration_controller.h" | 5 #include "ui/chromeos/touch_exploration_controller.h" |
6 | 6 |
7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 } | 64 } |
65 | 65 |
66 base::TimeDelta Now() { | 66 base::TimeDelta Now() { |
67 return base::TimeDelta::FromInternalValue( | 67 return base::TimeDelta::FromInternalValue( |
68 simulated_clock_->NowTicks().ToInternalValue()); | 68 simulated_clock_->NowTicks().ToInternalValue()); |
69 } | 69 } |
70 | 70 |
71 ui::GestureDetector::Config gesture_detector_config_; | 71 ui::GestureDetector::Config gesture_detector_config_; |
72 base::SimpleTestTickClock* simulated_clock_; | 72 base::SimpleTestTickClock* simulated_clock_; |
73 aura::Window* root_window_; | 73 aura::Window* root_window_; |
74 scoped_ptr<ui::test::TestEventHandler> event_handler_; | 74 std::unique_ptr<ui::test::TestEventHandler> event_handler_; |
75 | 75 |
76 private: | 76 private: |
77 DISALLOW_COPY_AND_ASSIGN(TouchExplorationTest); | 77 DISALLOW_COPY_AND_ASSIGN(TouchExplorationTest); |
78 }; | 78 }; |
79 | 79 |
80 #if defined(OS_CHROMEOS) | 80 #if defined(OS_CHROMEOS) |
81 // crbug.com/422943 | 81 // crbug.com/422943 |
82 #define MAYBE_NoRewritingEventsWhenOff DISABLED_NoRewritingEventsWhenOff | 82 #define MAYBE_NoRewritingEventsWhenOff DISABLED_NoRewritingEventsWhenOff |
83 #else | 83 #else |
84 #define MAYBE_NoRewritingEventsWhenOff NoRewritingEventsWhenOff | 84 #define MAYBE_NoRewritingEventsWhenOff NoRewritingEventsWhenOff |
85 #endif | 85 #endif |
86 | 86 |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 | 245 |
246 // Continuing to move the touch exploration finger should send more mouse | 246 // Continuing to move the touch exploration finger should send more mouse |
247 // events. | 247 // events. |
248 generator.MoveTouchId(gfx::Point(509, 609), 1); | 248 generator.MoveTouchId(gfx::Point(509, 609), 1); |
249 EXPECT_EQ(0, event_handler_->num_touch_events()); | 249 EXPECT_EQ(0, event_handler_->num_touch_events()); |
250 EXPECT_TRUE(cursor_client->IsMouseEventsEnabled()); | 250 EXPECT_TRUE(cursor_client->IsMouseEventsEnabled()); |
251 EXPECT_FALSE(cursor_client->IsCursorVisible()); | 251 EXPECT_FALSE(cursor_client->IsCursorVisible()); |
252 } | 252 } |
253 | 253 |
254 } // namespace ui | 254 } // namespace ui |
OLD | NEW |