| 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 <set> | 10 #include <set> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 namespace views { | 33 namespace views { |
| 34 class AuraInit; | 34 class AuraInit; |
| 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 BackgroundLayout; | 41 class BackgroundLayout; |
| 42 class ScreenlockLayout; |
| 42 class ShadowController; | 43 class ShadowController; |
| 43 class ShelfLayout; | 44 class ShelfLayout; |
| 44 class UserWindowControllerImpl; | 45 class UserWindowControllerImpl; |
| 45 class WindowLayout; | 46 class WindowLayout; |
| 46 class WindowManagerImpl; | 47 class WindowManagerImpl; |
| 47 | 48 |
| 48 class WindowManagerApplication | 49 class WindowManagerApplication |
| 49 : public mojo::ApplicationDelegate, | 50 : public mojo::ApplicationDelegate, |
| 50 public mus::WindowObserver, | 51 public mus::WindowObserver, |
| 51 public mus::mojom::WindowTreeHostClient, | 52 public mus::mojom::WindowTreeHostClient, |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 // |user_window_controller_| is created once OnEmbed() is called. Until that | 134 // |user_window_controller_| is created once OnEmbed() is called. Until that |
| 134 // time |user_window_controller_requests_| stores pending interface requests. | 135 // time |user_window_controller_requests_| stores pending interface requests. |
| 135 scoped_ptr<UserWindowControllerImpl> user_window_controller_; | 136 scoped_ptr<UserWindowControllerImpl> user_window_controller_; |
| 136 mojo::WeakBindingSet<mash::wm::mojom::UserWindowController> | 137 mojo::WeakBindingSet<mash::wm::mojom::UserWindowController> |
| 137 user_window_controller_binding_; | 138 user_window_controller_binding_; |
| 138 std::vector< | 139 std::vector< |
| 139 scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>> | 140 scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>> |
| 140 user_window_controller_requests_; | 141 user_window_controller_requests_; |
| 141 | 142 |
| 142 scoped_ptr<BackgroundLayout> background_layout_; | 143 scoped_ptr<BackgroundLayout> background_layout_; |
| 144 scoped_ptr<ScreenlockLayout> screenlock_layout_; |
| 143 scoped_ptr<ShelfLayout> shelf_layout_; | 145 scoped_ptr<ShelfLayout> shelf_layout_; |
| 144 scoped_ptr<WindowLayout> window_layout_; | 146 scoped_ptr<WindowLayout> window_layout_; |
| 145 | 147 |
| 146 scoped_ptr<ShadowController> shadow_controller_; | 148 scoped_ptr<ShadowController> shadow_controller_; |
| 147 | 149 |
| 148 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; | 150 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; |
| 149 | 151 |
| 150 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 152 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 151 }; | 153 }; |
| 152 | 154 |
| 153 } // namespace wm | 155 } // namespace wm |
| 154 } // namespace mash | 156 } // namespace mash |
| 155 | 157 |
| 156 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 158 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |