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/common/wm/workspace/workspace_window_resizer.h" | 5 #include "ash/common/wm/workspace/workspace_window_resizer.h" |
6 | 6 |
7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/shelf/shelf_constants.h" | 8 #include "ash/common/shelf/shelf_constants.h" |
9 #include "ash/common/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
11 #include "ash/common/wm/window_positioning_utils.h" | 11 #include "ash/common/wm/window_positioning_utils.h" |
12 #include "ash/common/wm/window_state.h" | 12 #include "ash/common/wm/window_state.h" |
13 #include "ash/common/wm/wm_event.h" | 13 #include "ash/common/wm/wm_event.h" |
14 #include "ash/common/wm/workspace/phantom_window_controller.h" | 14 #include "ash/common/wm/workspace/phantom_window_controller.h" |
| 15 #include "ash/common/wm/workspace_controller.h" |
15 #include "ash/display/display_manager.h" | 16 #include "ash/display/display_manager.h" |
16 #include "ash/screen_util.h" | 17 #include "ash/screen_util.h" |
17 #include "ash/shell.h" | 18 #include "ash/shell.h" |
18 #include "ash/test/ash_md_test_base.h" | 19 #include "ash/test/ash_md_test_base.h" |
19 #include "ash/test/display_manager_test_api.h" | 20 #include "ash/test/display_manager_test_api.h" |
20 #include "ash/wm/window_state_aura.h" | 21 #include "ash/wm/window_state_aura.h" |
21 #include "ash/wm/window_util.h" | 22 #include "ash/wm/window_util.h" |
22 #include "ash/wm/workspace_controller.h" | |
23 #include "base/command_line.h" | 23 #include "base/command_line.h" |
24 #include "base/strings/string_number_conversions.h" | 24 #include "base/strings/string_number_conversions.h" |
25 #include "base/strings/stringprintf.h" | 25 #include "base/strings/stringprintf.h" |
26 #include "ui/aura/client/aura_constants.h" | 26 #include "ui/aura/client/aura_constants.h" |
27 #include "ui/aura/test/test_window_delegate.h" | 27 #include "ui/aura/test/test_window_delegate.h" |
28 #include "ui/aura/window_event_dispatcher.h" | 28 #include "ui/aura/window_event_dispatcher.h" |
29 #include "ui/base/hit_test.h" | 29 #include "ui/base/hit_test.h" |
30 #include "ui/display/manager/display_layout.h" | 30 #include "ui/display/manager/display_layout.h" |
31 #include "ui/display/screen.h" | 31 #include "ui/display/screen.h" |
32 #include "ui/events/gesture_detection/gesture_configuration.h" | 32 #include "ui/events/gesture_detection/gesture_configuration.h" |
(...skipping 1850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1883 touch_resize_window_->bounds().ToString()); | 1883 touch_resize_window_->bounds().ToString()); |
1884 // Drag even more to snap to the edge. | 1884 // Drag even more to snap to the edge. |
1885 generator.GestureScrollSequence(gfx::Point(400, kRootHeight - 40), | 1885 generator.GestureScrollSequence(gfx::Point(400, kRootHeight - 40), |
1886 gfx::Point(400, kRootHeight - 25), | 1886 gfx::Point(400, kRootHeight - 25), |
1887 base::TimeDelta::FromMilliseconds(10), 5); | 1887 base::TimeDelta::FromMilliseconds(10), 5); |
1888 EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 100).ToString(), | 1888 EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 100).ToString(), |
1889 touch_resize_window_->bounds().ToString()); | 1889 touch_resize_window_->bounds().ToString()); |
1890 } | 1890 } |
1891 | 1891 |
1892 } // namespace ash | 1892 } // namespace ash |
OLD | NEW |