| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/ui/ws/window_tree.h" | 5 #include "services/ui/ws/window_tree.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 } // namespace | 124 } // namespace |
| 125 | 125 |
| 126 // ----------------------------------------------------------------------------- | 126 // ----------------------------------------------------------------------------- |
| 127 | 127 |
| 128 class WindowTreeTest : public testing::Test { | 128 class WindowTreeTest : public testing::Test { |
| 129 public: | 129 public: |
| 130 WindowTreeTest() {} | 130 WindowTreeTest() {} |
| 131 ~WindowTreeTest() override {} | 131 ~WindowTreeTest() override {} |
| 132 | 132 |
| 133 ui::mojom::Cursor cursor_id() { | 133 ui::mojom::Cursor cursor_id() { |
| 134 return static_cast<ui::mojom::Cursor>( | 134 return window_event_targeting_helper_.cursor(); |
| 135 window_event_targeting_helper_.cursor_id()); | |
| 136 } | 135 } |
| 137 Display* display() { return window_event_targeting_helper_.display(); } | 136 Display* display() { return window_event_targeting_helper_.display(); } |
| 138 TestWindowTreeBinding* last_binding() { | 137 TestWindowTreeBinding* last_binding() { |
| 139 return window_event_targeting_helper_.last_binding(); | 138 return window_event_targeting_helper_.last_binding(); |
| 140 } | 139 } |
| 141 TestWindowTreeClient* last_window_tree_client() { | 140 TestWindowTreeClient* last_window_tree_client() { |
| 142 return window_event_targeting_helper_.last_window_tree_client(); | 141 return window_event_targeting_helper_.last_window_tree_client(); |
| 143 } | 142 } |
| 144 TestWindowTreeClient* wm_client() { | 143 TestWindowTreeClient* wm_client() { |
| 145 return window_event_targeting_helper_.wm_client(); | 144 return window_event_targeting_helper_.wm_client(); |
| (...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1378 client->tracker()->changes()->clear(); | 1377 client->tracker()->changes()->clear(); |
| 1379 } | 1378 } |
| 1380 | 1379 |
| 1381 // Client should not have got any messages after shutdown. | 1380 // Client should not have got any messages after shutdown. |
| 1382 EXPECT_TRUE(client->tracker()->changes()->empty()); | 1381 EXPECT_TRUE(client->tracker()->changes()->empty()); |
| 1383 } | 1382 } |
| 1384 | 1383 |
| 1385 } // namespace test | 1384 } // namespace test |
| 1386 } // namespace ws | 1385 } // namespace ws |
| 1387 } // namespace ui | 1386 } // namespace ui |
| OLD | NEW |