| 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 <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 namespace views { | 31 namespace views { |
| 32 class AuraInit; | 32 class AuraInit; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace mash { | 35 namespace mash { |
| 36 namespace wm { | 36 namespace wm { |
| 37 | 37 |
| 38 class AcceleratorRegistrarImpl; | 38 class AcceleratorRegistrarImpl; |
| 39 class BackgroundLayout; | 39 class BackgroundLayout; |
| 40 class ShadowController; |
| 40 class ShelfLayout; | 41 class ShelfLayout; |
| 41 class WindowLayout; | 42 class WindowLayout; |
| 42 class WindowManagerImpl; | 43 class WindowManagerImpl; |
| 43 | 44 |
| 44 class WindowManagerApplication | 45 class WindowManagerApplication |
| 45 : public mojo::ApplicationDelegate, | 46 : public mojo::ApplicationDelegate, |
| 46 public mus::WindowObserver, | 47 public mus::WindowObserver, |
| 47 public mus::mojom::WindowTreeHostClient, | 48 public mus::mojom::WindowTreeHostClient, |
| 48 public mus::WindowTreeDelegate, | 49 public mus::WindowTreeDelegate, |
| 49 public mojo::InterfaceFactory<mus::mojom::WindowManager>, | 50 public mojo::InterfaceFactory<mus::mojom::WindowManager>, |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 // |window_manager_| is created once OnEmbed() is called. Until that time | 117 // |window_manager_| is created once OnEmbed() is called. Until that time |
| 117 // |requests_| stores any pending WindowManager interface requests. | 118 // |requests_| stores any pending WindowManager interface requests. |
| 118 scoped_ptr<WindowManagerImpl> window_manager_; | 119 scoped_ptr<WindowManagerImpl> window_manager_; |
| 119 mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_; | 120 mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_; |
| 120 ScopedVector<mojo::InterfaceRequest<mus::mojom::WindowManager>> requests_; | 121 ScopedVector<mojo::InterfaceRequest<mus::mojom::WindowManager>> requests_; |
| 121 | 122 |
| 122 scoped_ptr<BackgroundLayout> background_layout_; | 123 scoped_ptr<BackgroundLayout> background_layout_; |
| 123 scoped_ptr<ShelfLayout> shelf_layout_; | 124 scoped_ptr<ShelfLayout> shelf_layout_; |
| 124 scoped_ptr<WindowLayout> window_layout_; | 125 scoped_ptr<WindowLayout> window_layout_; |
| 125 | 126 |
| 127 scoped_ptr<ShadowController> shadow_controller_; |
| 128 |
| 126 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; | 129 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; |
| 127 | 130 |
| 128 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 131 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 129 }; | 132 }; |
| 130 | 133 |
| 131 } // namespace wm | 134 } // namespace wm |
| 132 } // namespace mash | 135 } // namespace mash |
| 133 | 136 |
| 134 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 137 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |