| 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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 // WindowServerDelegate: | 547 // WindowServerDelegate: |
| 548 void StartDisplayInit() override; | 548 void StartDisplayInit() override; |
| 549 void OnNoMoreDisplays() override; | 549 void OnNoMoreDisplays() override; |
| 550 std::unique_ptr<WindowTreeBinding> CreateWindowTreeBinding( | 550 std::unique_ptr<WindowTreeBinding> CreateWindowTreeBinding( |
| 551 BindingType type, | 551 BindingType type, |
| 552 ws::WindowServer* window_server, | 552 ws::WindowServer* window_server, |
| 553 ws::WindowTree* tree, | 553 ws::WindowTree* tree, |
| 554 mojom::WindowTreeRequest* tree_request, | 554 mojom::WindowTreeRequest* tree_request, |
| 555 mojom::WindowTreeClientPtr* client) override; | 555 mojom::WindowTreeClientPtr* client) override; |
| 556 bool IsTestConfig() const override; | 556 bool IsTestConfig() const override; |
| 557 void UpdateTouchTransforms() override {} | |
| 558 | 557 |
| 559 private: | 558 private: |
| 560 WindowServer* window_server_ = nullptr; | 559 WindowServer* window_server_ = nullptr; |
| 561 bool got_on_no_more_displays_ = false; | 560 bool got_on_no_more_displays_ = false; |
| 562 // All TestWindowTreeBinding objects created via CreateWindowTreeBinding. | 561 // All TestWindowTreeBinding objects created via CreateWindowTreeBinding. |
| 563 // These are owned by the corresponding WindowTree. | 562 // These are owned by the corresponding WindowTree. |
| 564 std::vector<TestWindowTreeBinding*> bindings_; | 563 std::vector<TestWindowTreeBinding*> bindings_; |
| 565 | 564 |
| 566 DISALLOW_COPY_AND_ASSIGN(TestWindowServerDelegate); | 565 DISALLOW_COPY_AND_ASSIGN(TestWindowServerDelegate); |
| 567 }; | 566 }; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); | 672 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id); |
| 674 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, | 673 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree, |
| 675 ServerWindow* parent, | 674 ServerWindow* parent, |
| 676 ClientWindowId* client_id); | 675 ClientWindowId* client_id); |
| 677 | 676 |
| 678 } // namespace test | 677 } // namespace test |
| 679 } // namespace ws | 678 } // namespace ws |
| 680 } // namespace ui | 679 } // namespace ui |
| 681 | 680 |
| 682 #endif // SERVICES_UI_WS_TEST_UTILS_H_ | 681 #endif // SERVICES_UI_WS_TEST_UTILS_H_ |
| OLD | NEW |