| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_MUS_WINDOW_TREE_CLIENT_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 class InFlightChange; | 50 class InFlightChange; |
| 51 class InFlightFocusChange; | 51 class InFlightFocusChange; |
| 52 class InFlightPropertyChange; | 52 class InFlightPropertyChange; |
| 53 class InFlightVisibleChange; | 53 class InFlightVisibleChange; |
| 54 class WindowMus; | 54 class WindowMus; |
| 55 class WindowPortMus; | 55 class WindowPortMus; |
| 56 struct WindowPortPropertyData; | 56 struct WindowPortPropertyData; |
| 57 class WindowTreeClientDelegate; | 57 class WindowTreeClientDelegate; |
| 58 class WindowTreeClientPrivate; | 58 class WindowTreeClientPrivate; |
| 59 class WindowTreeClientObserver; | 59 class WindowTreeClientObserver; |
| 60 class WindowTreeHost; | |
| 61 class WindowTreeHostMus; | 60 class WindowTreeHostMus; |
| 62 | 61 |
| 63 namespace client { | 62 namespace client { |
| 64 class CaptureClient; | 63 class CaptureClient; |
| 65 } | 64 } |
| 66 | 65 |
| 67 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>; | 66 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>; |
| 68 | 67 |
| 69 // Manages the connection with mus. | 68 // Manages the connection with mus. |
| 70 // | 69 // |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 | 230 |
| 232 // OnEmbed() calls into this. Exposed as a separate function for testing. | 231 // OnEmbed() calls into this. Exposed as a separate function for testing. |
| 233 void OnEmbedImpl(ui::mojom::WindowTree* window_tree, | 232 void OnEmbedImpl(ui::mojom::WindowTree* window_tree, |
| 234 ClientSpecificId client_id, | 233 ClientSpecificId client_id, |
| 235 ui::mojom::WindowDataPtr root_data, | 234 ui::mojom::WindowDataPtr root_data, |
| 236 int64_t display_id, | 235 int64_t display_id, |
| 237 Id focused_window_id, | 236 Id focused_window_id, |
| 238 bool drawn); | 237 bool drawn); |
| 239 | 238 |
| 240 // Called by WmNewDisplayAdded(). | 239 // Called by WmNewDisplayAdded(). |
| 241 WindowTreeHost* WmNewDisplayAddedImpl(const display::Display& display, | 240 WindowTreeHostMus* WmNewDisplayAddedImpl(const display::Display& display, |
| 242 ui::mojom::WindowDataPtr root_data, | 241 ui::mojom::WindowDataPtr root_data, |
| 243 bool parent_drawn); | 242 bool parent_drawn); |
| 244 | 243 |
| 245 std::unique_ptr<EventResultCallback> CreateEventResultCallback( | 244 std::unique_ptr<EventResultCallback> CreateEventResultCallback( |
| 246 int32_t event_id); | 245 int32_t event_id); |
| 247 | 246 |
| 248 void OnReceivedCursorLocationMemory(mojo::ScopedSharedBufferHandle handle); | 247 void OnReceivedCursorLocationMemory(mojo::ScopedSharedBufferHandle handle); |
| 249 | 248 |
| 250 // Called when a property needs to change as the result of a change in the | 249 // Called when a property needs to change as the result of a change in the |
| 251 // server, or the server failing to accept a change. | 250 // server, or the server failing to accept a change. |
| 252 void SetWindowBoundsFromServer(WindowMus* window, | 251 void SetWindowBoundsFromServer(WindowMus* window, |
| 253 const gfx::Rect& revert_bounds); | 252 const gfx::Rect& revert_bounds); |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; | 515 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; |
| 517 | 516 |
| 518 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 517 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 519 | 518 |
| 520 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 519 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 521 }; | 520 }; |
| 522 | 521 |
| 523 } // namespace aura | 522 } // namespace aura |
| 524 | 523 |
| 525 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 524 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |