| 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_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 // TestWindowTreeClientSetup is used to create a WindowTreeClient that is not | 23 // TestWindowTreeClientSetup is used to create a WindowTreeClient that is not |
| 24 // connected to mus. | 24 // connected to mus. |
| 25 class TestWindowTreeClientSetup { | 25 class TestWindowTreeClientSetup { |
| 26 public: | 26 public: |
| 27 TestWindowTreeClientSetup(); | 27 TestWindowTreeClientSetup(); |
| 28 ~TestWindowTreeClientSetup(); | 28 ~TestWindowTreeClientSetup(); |
| 29 | 29 |
| 30 // Initializes the WindowTreeClient. | 30 // Initializes the WindowTreeClient. |
| 31 void Init(WindowTreeClientDelegate* window_tree_delegate); | 31 void Init(WindowTreeClientDelegate* window_tree_delegate); |
| 32 void InitForWindowManager(WindowTreeClientDelegate* window_tree_delegate, | 32 void InitForWindowManager(WindowTreeClientDelegate* window_tree_delegate, |
| 33 WindowManagerDelegate* window_manager_delegate, | 33 WindowManagerDelegate* window_manager_delegate); |
| 34 const display::Display& display); | |
| 35 | 34 |
| 36 // The WindowTree that WindowTreeClient talks to. | 35 // The WindowTree that WindowTreeClient talks to. |
| 37 TestWindowTree* window_tree() { return window_tree_.get(); } | 36 TestWindowTree* window_tree() { return window_tree_.get(); } |
| 38 | 37 |
| 39 // Returns ownership of WindowTreeClient to the caller. | 38 // Returns ownership of WindowTreeClient to the caller. |
| 40 std::unique_ptr<WindowTreeClient> OwnWindowTreeClient(); | 39 std::unique_ptr<WindowTreeClient> OwnWindowTreeClient(); |
| 41 | 40 |
| 42 WindowTreeClient* window_tree_client(); | 41 WindowTreeClient* window_tree_client(); |
| 43 | 42 |
| 44 private: | 43 private: |
| 45 // Called by both implementations of init to perform common initialization. | 44 // Called by both implementations of init to perform common initialization. |
| 46 void CommonInit(WindowTreeClientDelegate* window_tree_delegate, | 45 void CommonInit(WindowTreeClientDelegate* window_tree_delegate, |
| 47 WindowManagerDelegate* window_manager_delegate); | 46 WindowManagerDelegate* window_manager_delegate); |
| 48 | 47 |
| 49 std::unique_ptr<TestWindowTree> window_tree_; | 48 std::unique_ptr<TestWindowTree> window_tree_; |
| 50 | 49 |
| 51 std::unique_ptr<WindowTreeClient> window_tree_client_; | 50 std::unique_ptr<WindowTreeClient> window_tree_client_; |
| 52 | 51 |
| 53 DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup); | 52 DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup); |
| 54 }; | 53 }; |
| 55 | 54 |
| 56 } // namespace ui | 55 } // namespace ui |
| 57 | 56 |
| 58 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ | 57 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_ |
| OLD | NEW |