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 20 matching lines...) Expand all Loading... |
31 #include "ui/aura/mus/window_tree_host_mus_delegate.h" | 31 #include "ui/aura/mus/window_tree_host_mus_delegate.h" |
32 | 32 |
33 namespace display { | 33 namespace display { |
34 class Display; | 34 class Display; |
35 } | 35 } |
36 | 36 |
37 namespace gfx { | 37 namespace gfx { |
38 class Insets; | 38 class Insets; |
39 } | 39 } |
40 | 40 |
41 namespace ui { | |
42 struct PropertyData; | |
43 } | |
44 | |
45 namespace service_manager { | 41 namespace service_manager { |
46 class Connector; | 42 class Connector; |
47 } | 43 } |
48 | 44 |
49 namespace ui { | 45 namespace ui { |
| 46 class ContextFactory; |
50 class Gpu; | 47 class Gpu; |
| 48 struct PropertyData; |
51 } | 49 } |
52 | 50 |
53 namespace aura { | 51 namespace aura { |
54 class CaptureSynchronizer; | 52 class CaptureSynchronizer; |
55 class DragDropControllerMus; | 53 class DragDropControllerMus; |
56 class FocusSynchronizer; | 54 class FocusSynchronizer; |
57 class InFlightBoundsChange; | 55 class InFlightBoundsChange; |
58 class InFlightChange; | 56 class InFlightChange; |
59 class InFlightFocusChange; | 57 class InFlightFocusChange; |
60 class InFlightPropertyChange; | 58 class InFlightPropertyChange; |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 // The current change id for the window manager. | 533 // The current change id for the window manager. |
536 uint32_t current_wm_move_loop_change_ = 0u; | 534 uint32_t current_wm_move_loop_change_ = 0u; |
537 Id current_wm_move_loop_window_id_ = 0u; | 535 Id current_wm_move_loop_window_id_ = 0u; |
538 | 536 |
539 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; | 537 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; |
540 | 538 |
541 base::ObserverList<WindowTreeClientTestObserver> test_observers_; | 539 base::ObserverList<WindowTreeClientTestObserver> test_observers_; |
542 | 540 |
543 std::unique_ptr<ui::Gpu> gpu_; | 541 std::unique_ptr<ui::Gpu> gpu_; |
544 std::unique_ptr<MusContextFactory> compositor_context_factory_; | 542 std::unique_ptr<MusContextFactory> compositor_context_factory_; |
| 543 |
| 544 // If |compositor_context_factory_| is installed on Env, then this is the |
| 545 // ContextFactory that was set on Env originally. |
| 546 ui::ContextFactory* initial_context_factory_ = nullptr; |
545 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 547 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
546 | 548 |
547 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 549 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
548 }; | 550 }; |
549 | 551 |
550 } // namespace aura | 552 } // namespace aura |
551 | 553 |
552 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 554 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
OLD | NEW |