| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_controller.h" | 5 #include "ash/wm/workspace_controller.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "ash/common/session/session_controller.h" | |
| 10 #include "ash/common/shelf/shelf_layout_manager.h" | |
| 11 #include "ash/common/shelf/shelf_widget.h" | |
| 12 #include "ash/common/shelf/wm_shelf.h" | |
| 13 #include "ash/common/test/test_shelf_delegate.h" | |
| 14 #include "ash/common/wm/panels/panel_layout_manager.h" | |
| 15 #include "ash/common/wm/window_state.h" | |
| 16 #include "ash/common/wm/wm_event.h" | |
| 17 #include "ash/common/wm/workspace/workspace_window_resizer.h" | |
| 18 #include "ash/common/wm_shell.h" | |
| 19 #include "ash/common/wm_window.h" | |
| 20 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
| 21 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
| 11 #include "ash/session/session_controller.h" |
| 12 #include "ash/shelf/shelf_layout_manager.h" |
| 13 #include "ash/shelf/shelf_widget.h" |
| 14 #include "ash/shelf/wm_shelf.h" |
| 22 #include "ash/shell.h" | 15 #include "ash/shell.h" |
| 23 #include "ash/system/status_area_widget.h" | 16 #include "ash/system/status_area_widget.h" |
| 24 #include "ash/test/ash_test_base.h" | 17 #include "ash/test/ash_test_base.h" |
| 25 #include "ash/test/shell_test_api.h" | 18 #include "ash/test/shell_test_api.h" |
| 19 #include "ash/test/test_shelf_delegate.h" |
| 20 #include "ash/wm/panels/panel_layout_manager.h" |
| 21 #include "ash/wm/window_state.h" |
| 26 #include "ash/wm/window_state_aura.h" | 22 #include "ash/wm/window_state_aura.h" |
| 27 #include "ash/wm/window_util.h" | 23 #include "ash/wm/window_util.h" |
| 24 #include "ash/wm/wm_event.h" |
| 25 #include "ash/wm/workspace/workspace_window_resizer.h" |
| 26 #include "ash/wm_shell.h" |
| 27 #include "ash/wm_window.h" |
| 28 #include "base/strings/string_number_conversions.h" | 28 #include "base/strings/string_number_conversions.h" |
| 29 #include "ui/aura/client/aura_constants.h" | 29 #include "ui/aura/client/aura_constants.h" |
| 30 #include "ui/aura/test/test_window_delegate.h" | 30 #include "ui/aura/test/test_window_delegate.h" |
| 31 #include "ui/aura/test/test_windows.h" | 31 #include "ui/aura/test/test_windows.h" |
| 32 #include "ui/aura/window.h" | 32 #include "ui/aura/window.h" |
| 33 #include "ui/aura/window_event_dispatcher.h" | 33 #include "ui/aura/window_event_dispatcher.h" |
| 34 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
| 35 #include "ui/base/ui_base_types.h" | 35 #include "ui/base/ui_base_types.h" |
| 36 #include "ui/compositor/layer.h" | 36 #include "ui/compositor/layer.h" |
| 37 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 37 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
| (...skipping 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1641 ui::EventTimeForNow()); | 1641 ui::EventTimeForNow()); |
| 1642 target = targeter->FindTargetForEvent(root, &touch); | 1642 target = targeter->FindTargetForEvent(root, &touch); |
| 1643 if (points[i].is_target_hit) | 1643 if (points[i].is_target_hit) |
| 1644 EXPECT_EQ(window.get(), target); | 1644 EXPECT_EQ(window.get(), target); |
| 1645 else | 1645 else |
| 1646 EXPECT_NE(window.get(), target); | 1646 EXPECT_NE(window.get(), target); |
| 1647 } | 1647 } |
| 1648 } | 1648 } |
| 1649 | 1649 |
| 1650 } // namespace ash | 1650 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2736573002:
chromeos: Move files in //ash/common to //ash, part 2 (Closed)
