| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "services/ui/common/types.h" | 11 #include "services/ui/common/types.h" |
| 12 #include "services/ui/common/util.h" | 12 #include "services/ui/common/util.h" |
| 13 #include "services/ui/public/interfaces/window_tree.mojom.h" | 13 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 14 #include "services/ui/surfaces/display_compositor.h" | |
| 15 #include "services/ui/ws/display_manager.h" | 14 #include "services/ui/ws/display_manager.h" |
| 16 #include "services/ui/ws/ids.h" | 15 #include "services/ui/ws/ids.h" |
| 17 #include "services/ui/ws/platform_display.h" | 16 #include "services/ui/ws/platform_display.h" |
| 18 #include "services/ui/ws/platform_display_factory.h" | 17 #include "services/ui/ws/platform_display_factory.h" |
| 19 #include "services/ui/ws/server_window.h" | 18 #include "services/ui/ws/server_window.h" |
| 20 #include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h" | 19 #include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h" |
| 21 #include "services/ui/ws/test_utils.h" | 20 #include "services/ui/ws/test_utils.h" |
| 22 #include "services/ui/ws/window_manager_display_root.h" | 21 #include "services/ui/ws/window_manager_display_root.h" |
| 23 #include "services/ui/ws/window_manager_state.h" | 22 #include "services/ui/ws/window_manager_state.h" |
| 24 #include "services/ui/ws/window_server.h" | 23 #include "services/ui/ws/window_server.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 MoveCursorTo(gfx::Point(15, 15)); | 178 MoveCursorTo(gfx::Point(15, 15)); |
| 180 EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor()); | 179 EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor()); |
| 181 | 180 |
| 182 win->SetBounds(gfx::Rect(0, 0, 30, 30)); | 181 win->SetBounds(gfx::Rect(0, 0, 30, 30)); |
| 183 EXPECT_EQ(mojom::Cursor::IBEAM, cursor()); | 182 EXPECT_EQ(mojom::Cursor::IBEAM, cursor()); |
| 184 } | 183 } |
| 185 | 184 |
| 186 } // namespace test | 185 } // namespace test |
| 187 } // namespace ws | 186 } // namespace ws |
| 188 } // namespace ui | 187 } // namespace ui |
| OLD | NEW |