| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 MASH_SIMPLE_WM_SIMPLE_WM_H_ | 5 #ifndef MASH_SIMPLE_WM_SIMPLE_WM_H_ |
| 6 #define MASH_SIMPLE_WM_SIMPLE_WM_H_ | 6 #define MASH_SIMPLE_WM_SIMPLE_WM_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 public: | 45 public: |
| 46 SimpleWM(); | 46 SimpleWM(); |
| 47 ~SimpleWM() override; | 47 ~SimpleWM() override; |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 class DisplayLayoutManager; | 50 class DisplayLayoutManager; |
| 51 class FrameView; | 51 class FrameView; |
| 52 class WindowListModel; | 52 class WindowListModel; |
| 53 class WindowListModelObserver; | 53 class WindowListModelObserver; |
| 54 class WindowListView; | 54 class WindowListView; |
| 55 class WorkspaceLayoutManager; |
| 55 | 56 |
| 56 // service_manager::Service: | 57 // service_manager::Service: |
| 57 void OnStart() override; | 58 void OnStart() override; |
| 58 bool OnConnect(const service_manager::ServiceInfo& remote_info, | 59 bool OnConnect(const service_manager::ServiceInfo& remote_info, |
| 59 service_manager::InterfaceRegistry* registry) override; | 60 service_manager::InterfaceRegistry* registry) override; |
| 60 | 61 |
| 61 // aura::WindowTreeClientDelegate: | 62 // aura::WindowTreeClientDelegate: |
| 62 void OnEmbed( | 63 void OnEmbed( |
| 63 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; | 64 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; |
| 64 void OnLostConnection(aura::WindowTreeClient* client) override; | 65 void OnLostConnection(aura::WindowTreeClient* client) override; |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 aura::test::TestFocusClient focus_client_; | 107 aura::test::TestFocusClient focus_client_; |
| 107 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; | 108 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; |
| 108 aura::Window* display_root_ = nullptr; | 109 aura::Window* display_root_ = nullptr; |
| 109 aura::Window* window_root_ = nullptr; | 110 aura::Window* window_root_ = nullptr; |
| 110 aura::WindowManagerClient* window_manager_client_ = nullptr; | 111 aura::WindowManagerClient* window_manager_client_ = nullptr; |
| 111 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 112 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 112 std::unique_ptr<ui::Gpu> gpu_; | 113 std::unique_ptr<ui::Gpu> gpu_; |
| 113 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; | 114 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; |
| 114 std::map<aura::Window*, FrameView*> client_window_to_frame_view_; | 115 std::map<aura::Window*, FrameView*> client_window_to_frame_view_; |
| 115 std::unique_ptr<WindowListModel> window_list_model_; | 116 std::unique_ptr<WindowListModel> window_list_model_; |
| 117 std::unique_ptr<WorkspaceLayoutManager> workspace_layout_manager_; |
| 116 | 118 |
| 117 bool started_ = false; | 119 bool started_ = false; |
| 118 | 120 |
| 119 DISALLOW_COPY_AND_ASSIGN(SimpleWM); | 121 DISALLOW_COPY_AND_ASSIGN(SimpleWM); |
| 120 }; | 122 }; |
| 121 | 123 |
| 122 } // namespace simple_wm | 124 } // namespace simple_wm |
| 123 | 125 |
| 124 #endif // MASH_SIMPLE_WM_SIMPLE_WM_H_ | 126 #endif // MASH_SIMPLE_WM_SIMPLE_WM_H_ |
| OLD | NEW |