| 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 #ifndef SERVICES_UI_WS_TEST_UTILS_H_ | 5 #ifndef SERVICES_UI_WS_TEST_UTILS_H_ |
| 6 #define SERVICES_UI_WS_TEST_UTILS_H_ | 6 #define SERVICES_UI_WS_TEST_UTILS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi); | 131 DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi); |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 // ----------------------------------------------------------------------------- | 134 // ----------------------------------------------------------------------------- |
| 135 | 135 |
| 136 class DisplayTestApi { | 136 class DisplayTestApi { |
| 137 public: | 137 public: |
| 138 explicit DisplayTestApi(Display* display); | 138 explicit DisplayTestApi(Display* display); |
| 139 ~DisplayTestApi(); | 139 ~DisplayTestApi(); |
| 140 | 140 |
| 141 void OnEvent(const ui::Event& event) { display_->OnEvent(event); } | 141 void OnEvent(ui::Event* event) { display_->OnEventFromSource(event); } |
| 142 | 142 |
| 143 mojom::Cursor last_cursor() const { return display_->last_cursor_; } | 143 mojom::Cursor last_cursor() const { return display_->last_cursor_; } |
| 144 | 144 |
| 145 private: | 145 private: |
| 146 Display* display_; | 146 Display* display_; |
| 147 | 147 |
| 148 DISALLOW_COPY_AND_ASSIGN(DisplayTestApi); | 148 DISALLOW_COPY_AND_ASSIGN(DisplayTestApi); |
| 149 }; | 149 }; |
| 150 | 150 |
| 151 // ----------------------------------------------------------------------------- | 151 // ----------------------------------------------------------------------------- |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); | 686 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); |
| 687 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, | 687 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, |
| 688 ServerWindow* parent, | 688 ServerWindow* parent, |
| 689 ClientWindowId* client_id = nullptr); | 689 ClientWindowId* client_id = nullptr); |
| 690 | 690 |
| 691 } // namespace test | 691 } // namespace test |
| 692 } // namespace ws | 692 } // namespace ws |
| 693 } // namespace ui | 693 } // namespace ui |
| 694 | 694 |
| 695 #endif // SERVICES_UI_WS_TEST_UTILS_H_ | 695 #endif // SERVICES_UI_WS_TEST_UTILS_H_ |
| OLD | NEW |