| 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 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 ui::mojom::WindowTreePtr tree_ptr_; | 555 ui::mojom::WindowTreePtr tree_ptr_; |
| 556 // Typically this is the value contained in |tree_ptr_|, but tests may | 556 // Typically this is the value contained in |tree_ptr_|, but tests may |
| 557 // directly set this. | 557 // directly set this. |
| 558 ui::mojom::WindowTree* tree_; | 558 ui::mojom::WindowTree* tree_; |
| 559 | 559 |
| 560 // Set to true if OnEmbed() was received. | 560 // Set to true if OnEmbed() was received. |
| 561 bool is_from_embed_ = false; | 561 bool is_from_embed_ = false; |
| 562 | 562 |
| 563 bool in_destructor_; | 563 bool in_destructor_; |
| 564 | 564 |
| 565 bool enable_surface_synchronization_ = false; |
| 566 |
| 565 // A mapping to shared memory that is one 32 bit integer long. The window | 567 // A mapping to shared memory that is one 32 bit integer long. The window |
| 566 // server uses this to let us synchronously read the cursor location. | 568 // server uses this to let us synchronously read the cursor location. |
| 567 mojo::ScopedSharedBufferMapping cursor_location_mapping_; | 569 mojo::ScopedSharedBufferMapping cursor_location_mapping_; |
| 568 | 570 |
| 569 base::ObserverList<WindowTreeClientObserver> observers_; | 571 base::ObserverList<WindowTreeClientObserver> observers_; |
| 570 | 572 |
| 571 std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>> | 573 std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>> |
| 572 window_manager_internal_; | 574 window_manager_internal_; |
| 573 ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_; | 575 ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_; |
| 574 | 576 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 bool got_initial_displays_ = false; | 608 bool got_initial_displays_ = false; |
| 607 | 609 |
| 608 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 610 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 609 | 611 |
| 610 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 612 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 611 }; | 613 }; |
| 612 | 614 |
| 613 } // namespace aura | 615 } // namespace aura |
| 614 | 616 |
| 615 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 617 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |