| 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 | 193 |
| 194 // See InFlightChange for details on how InFlightChanges are used. | 194 // See InFlightChange for details on how InFlightChanges are used. |
| 195 uint32_t ScheduleInFlightChange(std::unique_ptr<InFlightChange> change); | 195 uint32_t ScheduleInFlightChange(std::unique_ptr<InFlightChange> change); |
| 196 | 196 |
| 197 // Returns true if there is an InFlightChange that matches |change|. If there | 197 // Returns true if there is an InFlightChange that matches |change|. If there |
| 198 // is an existing change SetRevertValueFrom() is invoked on it. Returns false | 198 // is an existing change SetRevertValueFrom() is invoked on it. Returns false |
| 199 // if there is no InFlightChange matching |change|. | 199 // if there is no InFlightChange matching |change|. |
| 200 // See InFlightChange for details on how InFlightChanges are used. | 200 // See InFlightChange for details on how InFlightChanges are used. |
| 201 bool ApplyServerChangeToExistingInFlightChange(const InFlightChange& change); | 201 bool ApplyServerChangeToExistingInFlightChange(const InFlightChange& change); |
| 202 | 202 |
| 203 void BuildWindowTree(const mojo::Array<ui::mojom::WindowDataPtr>& windows, | 203 void BuildWindowTree(const mojo::Array<ui::mojom::WindowDataPtr>& windows); |
| 204 WindowMus* initial_parent); | |
| 205 | 204 |
| 206 // Creates a WindowPortMus from the server side data. | 205 // Creates a WindowPortMus from the server side data. |
| 207 std::unique_ptr<WindowPortMus> CreateWindowPortMus( | 206 std::unique_ptr<WindowPortMus> CreateWindowPortMus( |
| 208 const ui::mojom::WindowDataPtr& window_data, | 207 const ui::mojom::WindowDataPtr& window_data, |
| 209 WindowMusType window_mus_type); | 208 WindowMusType window_mus_type); |
| 210 | 209 |
| 211 // Sets local properties on the associated Window from the server properties. | 210 // Sets local properties on the associated Window from the server properties. |
| 212 void SetLocalPropertiesFromServerProperties( | 211 void SetLocalPropertiesFromServerProperties( |
| 213 WindowMus* window, | 212 WindowMus* window, |
| 214 const ui::mojom::WindowDataPtr& window_data); | 213 const ui::mojom::WindowDataPtr& window_data); |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; | 509 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; |
| 511 | 510 |
| 512 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 511 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 513 | 512 |
| 514 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 513 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 515 }; | 514 }; |
| 516 | 515 |
| 517 } // namespace aura | 516 } // namespace aura |
| 518 | 517 |
| 519 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 518 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |