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/system_gesture_event_filter.h" | 5 #include "ash/wm/system_gesture_event_filter.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
10 #include "ash/common/wm_window.h" | |
11 #include "ash/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
12 #include "ash/shell.h" | 11 #include "ash/shell.h" |
13 #include "ash/system/tray/system_tray_delegate.h" | 12 #include "ash/system/tray/system_tray_delegate.h" |
14 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
15 #include "ash/test/shell_test_api.h" | 14 #include "ash/test/shell_test_api.h" |
16 #include "ash/wm/window_positioning_utils.h" | 15 #include "ash/wm/window_positioning_utils.h" |
17 #include "ash/wm/window_state.h" | 16 #include "ash/wm/window_state.h" |
18 #include "ash/wm/window_state_aura.h" | 17 #include "ash/wm/window_state_aura.h" |
| 18 #include "ash/wm_window.h" |
19 #include "base/time/time.h" | 19 #include "base/time/time.h" |
20 #include "base/timer/timer.h" | 20 #include "base/timer/timer.h" |
21 #include "ui/aura/env.h" | 21 #include "ui/aura/env.h" |
22 #include "ui/aura/test/test_window_delegate.h" | 22 #include "ui/aura/test/test_window_delegate.h" |
23 #include "ui/aura/test/test_windows.h" | 23 #include "ui/aura/test/test_windows.h" |
24 #include "ui/aura/window_event_dispatcher.h" | 24 #include "ui/aura/window_event_dispatcher.h" |
25 #include "ui/base/hit_test.h" | 25 #include "ui/base/hit_test.h" |
26 #include "ui/display/manager/display_manager.h" | 26 #include "ui/display/manager/display_manager.h" |
27 #include "ui/display/screen.h" | 27 #include "ui/display/screen.h" |
28 #include "ui/display/test/display_manager_test_api.h" | 28 #include "ui/display/test/display_manager_test_api.h" |
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 for (int i = 1; i <= 3; ++i) | 480 for (int i = 1; i <= 3; ++i) |
481 GetEventGenerator().ReleaseTouchId(i); | 481 GetEventGenerator().ReleaseTouchId(i); |
482 EXPECT_EQ(event_handler.num_gesture_events(), | 482 EXPECT_EQ(event_handler.num_gesture_events(), |
483 delegate.GetGestureCountAndReset()); | 483 delegate.GetGestureCountAndReset()); |
484 | 484 |
485 aura::Env::GetInstance()->RemovePreTargetHandler(&event_handler); | 485 aura::Env::GetInstance()->RemovePreTargetHandler(&event_handler); |
486 } | 486 } |
487 | 487 |
488 } // namespace test | 488 } // namespace test |
489 } // namespace ash | 489 } // namespace ash |
OLD | NEW |