| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_WM_WINDOW_MANAGER_APPLICATION_H_ | 5 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| 6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 namespace ui { | 33 namespace ui { |
| 34 class Event; | 34 class Event; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace mash { | 37 namespace mash { |
| 38 namespace wm { | 38 namespace wm { |
| 39 | 39 |
| 40 class AcceleratorRegistrarImpl; | 40 class AcceleratorRegistrarImpl; |
| 41 class RootWindowController; | 41 class RootWindowController; |
| 42 class RootWindowsObserver; | 42 class RootWindowsObserver; |
| 43 class ShelfLayoutImpl; |
| 43 class UserWindowControllerImpl; | 44 class UserWindowControllerImpl; |
| 44 | 45 |
| 45 class WindowManagerApplication | 46 class WindowManagerApplication |
| 46 : public shell::ShellClient, | 47 : public shell::ShellClient, |
| 47 public mus::mojom::WindowManagerFactory, | 48 public mus::mojom::WindowManagerFactory, |
| 48 public shell::InterfaceFactory<mojom::ShelfLayout>, | 49 public shell::InterfaceFactory<mojom::ShelfLayout>, |
| 49 public shell::InterfaceFactory<mojom::UserWindowController>, | 50 public shell::InterfaceFactory<mojom::UserWindowController>, |
| 50 public shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar> { | 51 public shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar> { |
| 51 public: | 52 public: |
| 52 WindowManagerApplication(); | 53 WindowManagerApplication(); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> | 109 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> |
| 109 client_request) override; | 110 client_request) override; |
| 110 | 111 |
| 111 shell::Connector* connector_; | 112 shell::Connector* connector_; |
| 112 | 113 |
| 113 mojo::TracingImpl tracing_; | 114 mojo::TracingImpl tracing_; |
| 114 | 115 |
| 115 std::unique_ptr<views::ScreenMus> screen_; | 116 std::unique_ptr<views::ScreenMus> screen_; |
| 116 std::unique_ptr<views::AuraInit> aura_init_; | 117 std::unique_ptr<views::AuraInit> aura_init_; |
| 117 | 118 |
| 118 // The ShelfLayout object is created once OnEmbed() is called. Until that | 119 // The |shelf_layout_| object is created once OnEmbed() is called. Until that |
| 119 // time |shelf_layout_requests_| stores pending interface requests. | 120 // time |shelf_layout_requests_| stores pending interface requests. |
| 121 std::unique_ptr<ShelfLayoutImpl> shelf_layout_; |
| 120 mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_; | 122 mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_; |
| 121 std::vector<std::unique_ptr<mojo::InterfaceRequest<mojom::ShelfLayout>>> | 123 std::vector<std::unique_ptr<mojo::InterfaceRequest<mojom::ShelfLayout>>> |
| 122 shelf_layout_requests_; | 124 shelf_layout_requests_; |
| 123 | 125 |
| 124 // |user_window_controller_| is created once OnEmbed() is called. Until that | 126 // |user_window_controller_| is created once OnEmbed() is called. Until that |
| 125 // time |user_window_controller_requests_| stores pending interface requests. | 127 // time |user_window_controller_requests_| stores pending interface requests. |
| 126 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; | 128 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; |
| 127 mojo::BindingSet<mojom::UserWindowController> | 129 mojo::BindingSet<mojom::UserWindowController> |
| 128 user_window_controller_bindings_; | 130 user_window_controller_bindings_; |
| 129 std::vector< | 131 std::vector< |
| (...skipping 10 matching lines...) Expand all Loading... |
| 140 | 142 |
| 141 base::ObserverList<RootWindowsObserver> root_windows_observers_; | 143 base::ObserverList<RootWindowsObserver> root_windows_observers_; |
| 142 | 144 |
| 143 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 145 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 144 }; | 146 }; |
| 145 | 147 |
| 146 } // namespace wm | 148 } // namespace wm |
| 147 } // namespace mash | 149 } // namespace mash |
| 148 | 150 |
| 149 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 151 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |