| 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/display/viewport_metrics.h" | 13 #include "services/ui/display/viewport_metrics.h" |
| 14 #include "services/ui/public/interfaces/window_tree.mojom.h" | 14 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 15 #include "services/ui/ws/display_manager.h" | 15 #include "services/ui/ws/display_manager.h" |
| 16 #include "services/ui/ws/ids.h" | 16 #include "services/ui/ws/ids.h" |
| 17 #include "services/ui/ws/platform_display.h" | 17 #include "services/ui/ws/platform_display.h" |
| 18 #include "services/ui/ws/platform_display_factory.h" | 18 #include "services/ui/ws/platform_display_factory.h" |
| 19 #include "services/ui/ws/server_window.h" | 19 #include "services/ui/ws/server_window.h" |
| 20 #include "services/ui/ws/test_utils.h" | 20 #include "services/ui/ws/test_utils.h" |
| 21 #include "services/ui/ws/window_manager_display_root.h" | 21 #include "services/ui/ws/window_manager_display_root.h" |
| 22 #include "services/ui/ws/window_manager_state.h" | 22 #include "services/ui/ws/window_manager_state.h" |
| 23 #include "services/ui/ws/window_server.h" | 23 #include "services/ui/ws/window_server.h" |
| 24 #include "services/ui/ws/window_server_delegate.h" | 24 #include "services/ui/ws/window_server_delegate.h" |
| 25 #include "services/ui/ws/window_tree.h" | 25 #include "services/ui/ws/window_tree.h" |
| 26 #include "services/ui/ws/window_tree_binding.h" | 26 #include "services/ui/ws/window_tree_binding.h" |
| 27 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
| 28 #include "ui/base/cursor/cursor.h" |
| 28 #include "ui/display/display.h" | 29 #include "ui/display/display.h" |
| 29 #include "ui/events/event.h" | 30 #include "ui/events/event.h" |
| 30 #include "ui/gfx/geometry/rect.h" | 31 #include "ui/gfx/geometry/rect.h" |
| 31 | 32 |
| 32 namespace ui { | 33 namespace ui { |
| 33 namespace ws { | 34 namespace ws { |
| 34 namespace test { | 35 namespace test { |
| 35 namespace { | 36 namespace { |
| 36 | 37 |
| 37 const UserId kTestId1 = "2"; | 38 const UserId kTestId1 = "2"; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 ~DisplayTest() override {} | 97 ~DisplayTest() override {} |
| 97 | 98 |
| 98 WindowServer* window_server() { return ws_test_helper_.window_server(); } | 99 WindowServer* window_server() { return ws_test_helper_.window_server(); } |
| 99 DisplayManager* display_manager() { | 100 DisplayManager* display_manager() { |
| 100 return window_server()->display_manager(); | 101 return window_server()->display_manager(); |
| 101 } | 102 } |
| 102 TestWindowServerDelegate* window_server_delegate() { | 103 TestWindowServerDelegate* window_server_delegate() { |
| 103 return ws_test_helper_.window_server_delegate(); | 104 return ws_test_helper_.window_server_delegate(); |
| 104 } | 105 } |
| 105 TestScreenManager& screen_manager() { return screen_manager_; } | 106 TestScreenManager& screen_manager() { return screen_manager_; } |
| 107 const ui::CursorData& cursor() { return ws_test_helper_.cursor(); } |
| 106 | 108 |
| 107 protected: | 109 protected: |
| 108 // testing::Test: | 110 // testing::Test: |
| 109 void SetUp() override { | 111 void SetUp() override { |
| 110 screen_manager_.Init(window_server()->display_manager()); | 112 screen_manager_.Init(window_server()->display_manager()); |
| 111 window_server()->user_id_tracker()->AddUserId(kTestId1); | 113 window_server()->user_id_tracker()->AddUserId(kTestId1); |
| 112 window_server()->user_id_tracker()->AddUserId(kTestId2); | 114 window_server()->user_id_tracker()->AddUserId(kTestId2); |
| 113 } | 115 } |
| 114 | 116 |
| 115 private: | 117 private: |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 ASSERT_EQ(0u, tree_client->tracker()->changes()->size()); | 426 ASSERT_EQ(0u, tree_client->tracker()->changes()->size()); |
| 425 | 427 |
| 426 // The window should be destroyed when the client says so. | 428 // The window should be destroyed when the client says so. |
| 427 ASSERT_TRUE(tree->DeleteWindow(secondary_root_id)); | 429 ASSERT_TRUE(tree->DeleteWindow(secondary_root_id)); |
| 428 EXPECT_TRUE(secondary_root_destroyed); | 430 EXPECT_TRUE(secondary_root_destroyed); |
| 429 } | 431 } |
| 430 | 432 |
| 431 } // namespace test | 433 } // namespace test |
| 432 } // namespace ws | 434 } // namespace ws |
| 433 } // namespace ui | 435 } // namespace ui |
| OLD | NEW |