| 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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 ui::mojom::FrameDecorationValuesPtr values) override; | 449 ui::mojom::FrameDecorationValuesPtr values) override; |
| 450 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; | 450 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; |
| 451 void AddAccelerators(std::vector<ui::mojom::WmAcceleratorPtr> accelerators, | 451 void AddAccelerators(std::vector<ui::mojom::WmAcceleratorPtr> accelerators, |
| 452 const base::Callback<void(bool)>& callback) override; | 452 const base::Callback<void(bool)>& callback) override; |
| 453 void RemoveAccelerator(uint32_t id) override; | 453 void RemoveAccelerator(uint32_t id) override; |
| 454 void AddActivationParent(Window* window) override; | 454 void AddActivationParent(Window* window) override; |
| 455 void RemoveActivationParent(Window* window) override; | 455 void RemoveActivationParent(Window* window) override; |
| 456 void ActivateNextWindow() override; | 456 void ActivateNextWindow() override; |
| 457 void SetExtendedHitArea(Window* window, const gfx::Insets& hit_area) override; | 457 void SetExtendedHitArea(Window* window, const gfx::Insets& hit_area) override; |
| 458 void RequestClose(Window* window) override; | 458 void RequestClose(Window* window) override; |
| 459 bool WaitForInitialDisplays() override; |
| 459 | 460 |
| 460 // Overriden from WindowTreeHostMusDelegate: | 461 // Overriden from WindowTreeHostMusDelegate: |
| 461 void OnWindowTreeHostBoundsWillChange(WindowTreeHostMus* window_tree_host, | 462 void OnWindowTreeHostBoundsWillChange(WindowTreeHostMus* window_tree_host, |
| 462 const gfx::Rect& bounds) override; | 463 const gfx::Rect& bounds) override; |
| 463 void OnWindowTreeHostClientAreaWillChange( | 464 void OnWindowTreeHostClientAreaWillChange( |
| 464 WindowTreeHostMus* window_tree_host, | 465 WindowTreeHostMus* window_tree_host, |
| 465 const gfx::Insets& client_area, | 466 const gfx::Insets& client_area, |
| 466 const std::vector<gfx::Rect>& additional_client_areas) override; | 467 const std::vector<gfx::Rect>& additional_client_areas) override; |
| 467 void OnWindowTreeHostHitTestMaskWillChange( | 468 void OnWindowTreeHostHitTestMaskWillChange( |
| 468 WindowTreeHostMus* window_tree_host, | 469 WindowTreeHostMus* window_tree_host, |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 | 582 |
| 582 std::unique_ptr<ui::Gpu> gpu_; | 583 std::unique_ptr<ui::Gpu> gpu_; |
| 583 std::unique_ptr<MusContextFactory> compositor_context_factory_; | 584 std::unique_ptr<MusContextFactory> compositor_context_factory_; |
| 584 | 585 |
| 585 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> | 586 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 586 discardable_shared_memory_manager_; | 587 discardable_shared_memory_manager_; |
| 587 | 588 |
| 588 // If |compositor_context_factory_| is installed on Env, then this is the | 589 // If |compositor_context_factory_| is installed on Env, then this is the |
| 589 // ContextFactory that was set on Env originally. | 590 // ContextFactory that was set on Env originally. |
| 590 ui::ContextFactory* initial_context_factory_ = nullptr; | 591 ui::ContextFactory* initial_context_factory_ = nullptr; |
| 592 |
| 593 // Set to true once OnWmDisplayAdded() is called. |
| 594 bool got_initial_displays_ = false; |
| 595 |
| 591 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 596 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
| 592 | 597 |
| 593 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 598 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
| 594 }; | 599 }; |
| 595 | 600 |
| 596 } // namespace aura | 601 } // namespace aura |
| 597 | 602 |
| 598 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 603 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
| OLD | NEW |