| 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/wm/workspace_controller.h" | 5 #include "ash/wm/workspace_controller.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "ui/aura/test/test_window_delegate.h" | 27 #include "ui/aura/test/test_window_delegate.h" |
| 28 #include "ui/aura/test/test_windows.h" | 28 #include "ui/aura/test/test_windows.h" |
| 29 #include "ui/aura/window.h" | 29 #include "ui/aura/window.h" |
| 30 #include "ui/aura/window_event_dispatcher.h" | 30 #include "ui/aura/window_event_dispatcher.h" |
| 31 #include "ui/base/hit_test.h" | 31 #include "ui/base/hit_test.h" |
| 32 #include "ui/base/ui_base_types.h" | 32 #include "ui/base/ui_base_types.h" |
| 33 #include "ui/compositor/layer.h" | 33 #include "ui/compositor/layer.h" |
| 34 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 34 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
| 35 #include "ui/events/event_utils.h" | 35 #include "ui/events/event_utils.h" |
| 36 #include "ui/gfx/screen.h" | 36 #include "ui/gfx/screen.h" |
| 37 #include "ui/views/corewm/window_animations.h" | |
| 38 #include "ui/views/corewm/window_util.h" | |
| 39 #include "ui/views/widget/widget.h" | 37 #include "ui/views/widget/widget.h" |
| 38 #include "ui/wm/core/window_animations.h" |
| 39 #include "ui/wm/core/window_util.h" |
| 40 | 40 |
| 41 using aura::Window; | 41 using aura::Window; |
| 42 | 42 |
| 43 namespace ash { | 43 namespace ash { |
| 44 namespace internal { | 44 namespace internal { |
| 45 | 45 |
| 46 // Returns a string containing the names of all the children of |window| (in | 46 // Returns a string containing the names of all the children of |window| (in |
| 47 // order). Each entry is separated by a space. | 47 // order). Each entry is separated by a space. |
| 48 std::string GetWindowNames(const aura::Window* window) { | 48 std::string GetWindowNames(const aura::Window* window) { |
| 49 std::string result; | 49 std::string result; |
| (...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1498 target = targeter->FindTargetForEvent(root, &touch); | 1498 target = targeter->FindTargetForEvent(root, &touch); |
| 1499 if (points[i].is_target_hit) | 1499 if (points[i].is_target_hit) |
| 1500 EXPECT_EQ(window.get(), target); | 1500 EXPECT_EQ(window.get(), target); |
| 1501 else | 1501 else |
| 1502 EXPECT_NE(window.get(), target); | 1502 EXPECT_NE(window.get(), target); |
| 1503 } | 1503 } |
| 1504 } | 1504 } |
| 1505 | 1505 |
| 1506 } // namespace internal | 1506 } // namespace internal |
| 1507 } // namespace ash | 1507 } // namespace ash |
| OLD | NEW |