| 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 UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_ | 5 #ifndef UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_ |
| 6 #define UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_ | 6 #define UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" |
| 13 #include "ui/aura/mus/mus_types.h" | 14 #include "ui/aura/mus/mus_types.h" |
| 14 | 15 |
| 15 namespace display { | 16 namespace display { |
| 16 class Display; | 17 class Display; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace ui { | 20 namespace ui { |
| 20 class Event; | 21 class Event; |
| 21 | 22 |
| 22 namespace mojom { | 23 namespace mojom { |
| 23 class WindowTree; | 24 class WindowTree; |
| 24 } | 25 } |
| 25 } | 26 } |
| 26 | 27 |
| 27 namespace aura { | 28 namespace aura { |
| 28 | 29 |
| 29 class Window; | 30 class Window; |
| 30 class WindowTreeClient; | 31 class WindowTreeClient; |
| 31 class WindowTreeHost; | 32 class WindowTreeHostMus; |
| 32 | 33 |
| 33 // Use to access implementation details of WindowTreeClient. | 34 // Use to access implementation details of WindowTreeClient. |
| 34 class WindowTreeClientPrivate { | 35 class WindowTreeClientPrivate { |
| 35 public: | 36 public: |
| 36 explicit WindowTreeClientPrivate(WindowTreeClient* tree_client_impl); | 37 explicit WindowTreeClientPrivate(WindowTreeClient* tree_client_impl); |
| 37 explicit WindowTreeClientPrivate(Window* window); | 38 explicit WindowTreeClientPrivate(Window* window); |
| 38 ~WindowTreeClientPrivate(); | 39 ~WindowTreeClientPrivate(); |
| 39 | 40 |
| 40 // Calls OnEmbed() on the WindowTreeClient. | 41 // Calls OnEmbed() on the WindowTreeClient. |
| 41 void OnEmbed(ui::mojom::WindowTree* window_tree); | 42 void OnEmbed(ui::mojom::WindowTree* window_tree); |
| 42 | 43 |
| 43 WindowTreeHost* CallWmNewDisplayAdded(const display::Display& display); | 44 WindowTreeHostMus* CallWmNewDisplayAdded(const display::Display& display); |
| 45 WindowTreeHostMus* CallWmNewDisplayAdded(const display::Display& display, |
| 46 ui::mojom::WindowDataPtr root_data, |
| 47 bool parent_drawn); |
| 44 | 48 |
| 45 // Pretends that |event| has been received from the window server. | 49 // Pretends that |event| has been received from the window server. |
| 46 void CallOnWindowInputEvent(Window* window, std::unique_ptr<ui::Event> event); | 50 void CallOnWindowInputEvent(Window* window, std::unique_ptr<ui::Event> event); |
| 47 | 51 |
| 48 void CallOnCaptureChanged(Window* new_capture, Window* old_capture); | 52 void CallOnCaptureChanged(Window* new_capture, Window* old_capture); |
| 49 | 53 |
| 50 // Sets the WindowTree and client id. | 54 // Sets the WindowTree and client id. |
| 51 void SetTreeAndClientId(ui::mojom::WindowTree* window_tree, | 55 void SetTreeAndClientId(ui::mojom::WindowTree* window_tree, |
| 52 ClientSpecificId client_id); | 56 ClientSpecificId client_id); |
| 53 | 57 |
| 54 bool HasPointerWatcher(); | 58 bool HasPointerWatcher(); |
| 55 | 59 |
| 56 private: | 60 private: |
| 57 WindowTreeClient* tree_client_impl_; | 61 WindowTreeClient* tree_client_impl_; |
| 58 uint16_t next_window_id_ = 1u; | 62 uint16_t next_window_id_ = 1u; |
| 59 | 63 |
| 60 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientPrivate); | 64 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientPrivate); |
| 61 }; | 65 }; |
| 62 | 66 |
| 63 } // namespace ui | 67 } // namespace ui |
| 64 | 68 |
| 65 #endif // UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_ | 69 #endif // UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_ |
| OLD | NEW |