| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi); | 130 DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi); |
| 131 }; | 131 }; |
| 132 | 132 |
| 133 // ----------------------------------------------------------------------------- | 133 // ----------------------------------------------------------------------------- |
| 134 | 134 |
| 135 class DisplayTestApi { | 135 class DisplayTestApi { |
| 136 public: | 136 public: |
| 137 explicit DisplayTestApi(Display* display); | 137 explicit DisplayTestApi(Display* display); |
| 138 ~DisplayTestApi(); | 138 ~DisplayTestApi(); |
| 139 | 139 |
| 140 void OnEvent(const ui::Event& event) { display_->OnEvent(event); } | 140 void OnEvent(ui::Event* event) { display_->OnEventFromSource(event); } |
| 141 | 141 |
| 142 mojom::Cursor last_cursor() const { return display_->last_cursor_; } | 142 mojom::Cursor last_cursor() const { return display_->last_cursor_; } |
| 143 | 143 |
| 144 private: | 144 private: |
| 145 Display* display_; | 145 Display* display_; |
| 146 | 146 |
| 147 DISALLOW_COPY_AND_ASSIGN(DisplayTestApi); | 147 DISALLOW_COPY_AND_ASSIGN(DisplayTestApi); |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 // ----------------------------------------------------------------------------- | 150 // ----------------------------------------------------------------------------- |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); | 677 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); |
| 678 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, | 678 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, |
| 679 ServerWindow* parent, | 679 ServerWindow* parent, |
| 680 ClientWindowId* client_id = nullptr); | 680 ClientWindowId* client_id = nullptr); |
| 681 | 681 |
| 682 } // namespace test | 682 } // namespace test |
| 683 } // namespace ws | 683 } // namespace ws |
| 684 } // namespace ui | 684 } // namespace ui |
| 685 | 685 |
| 686 #endif // SERVICES_UI_WS_TEST_UTILS_H_ | 686 #endif // SERVICES_UI_WS_TEST_UTILS_H_ |
| OLD | NEW |