| 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 12 matching lines...) Expand all Loading... |
| 23 #include "services/ui/public/interfaces/window_tree.mojom.h" | 23 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 24 #include "ui/aura/aura_export.h" | 24 #include "ui/aura/aura_export.h" |
| 25 #include "ui/aura/client/transient_window_client_observer.h" | 25 #include "ui/aura/client/transient_window_client_observer.h" |
| 26 #include "ui/aura/mus/capture_synchronizer_delegate.h" | 26 #include "ui/aura/mus/capture_synchronizer_delegate.h" |
| 27 #include "ui/aura/mus/drag_drop_controller_host.h" | 27 #include "ui/aura/mus/drag_drop_controller_host.h" |
| 28 #include "ui/aura/mus/focus_synchronizer_delegate.h" | 28 #include "ui/aura/mus/focus_synchronizer_delegate.h" |
| 29 #include "ui/aura/mus/mus_types.h" | 29 #include "ui/aura/mus/mus_types.h" |
| 30 #include "ui/aura/mus/window_manager_delegate.h" | 30 #include "ui/aura/mus/window_manager_delegate.h" |
| 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 base { |
| 34 class Thread; |
| 35 } |
| 36 |
| 37 namespace discardable_memory { |
| 38 class ClientDiscardableSharedMemoryManager; |
| 39 } |
| 40 |
| 33 namespace display { | 41 namespace display { |
| 34 class Display; | 42 class Display; |
| 35 } | 43 } |
| 36 | 44 |
| 37 namespace gfx { | 45 namespace gfx { |
| 38 class Insets; | 46 class Insets; |
| 39 } | 47 } |
| 40 | 48 |
| 41 namespace service_manager { | 49 namespace service_manager { |
| 42 class Connector; | 50 class Connector; |
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 base::Callback<void(bool)> on_current_move_finished_; | 544 base::Callback<void(bool)> on_current_move_finished_; |
| 537 | 545 |
| 538 // The current change id for the window manager. | 546 // The current change id for the window manager. |
| 539 uint32_t current_wm_move_loop_change_ = 0u; | 547 uint32_t current_wm_move_loop_change_ = 0u; |
| 540 Id current_wm_move_loop_window_id_ = 0u; | 548 Id current_wm_move_loop_window_id_ = 0u; |
| 541 | 549 |
| 542 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; | 550 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; |
| 543 | 551 |
| 544 base::ObserverList<WindowTreeClientTestObserver> test_observers_; | 552 base::ObserverList<WindowTreeClientTestObserver> test_observers_; |
| 545 | 553 |
| 554 // IO thread for GPU and discardable shared memory IPC. |
| 555 std::unique_ptr<base::Thread> io_thread_; |
| 556 |
| 546 std::unique_ptr<ui::Gpu> gpu_; | 557 std::unique_ptr<ui::Gpu> gpu_; |
| 547 std::unique_ptr<MusContextFactory> compositor_context_factory_; | 558 std::unique_ptr<MusContextFactory> compositor_context_factory_; |
| 548 | 559 |
| 560 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 561 discardable_shared_memory_manager_; |
| 562 |
| 549 // If |compositor_context_factory_| is installed on Env, then this is the | 563 // If |compositor_context_factory_| is installed on Env, then this is the |
| 550 // ContextFactory that was set on Env originally. | 564 // ContextFactory that was set on Env originally. |
| 551 ui::ContextFactory* initial_context_factory_ = nullptr; | 565 ui::ContextFactory* initial_context_factory_ = nullptr; |
| 552 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 566 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 553 | 567 |
| 554 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 568 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 555 }; | 569 }; |
| 556 | 570 |
| 557 } // namespace aura | 571 } // namespace aura |
| 558 | 572 |
| 559 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 573 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |