| 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 "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
| 11 #include "components/mus/common/types.h" | 11 #include "components/mus/common/types.h" |
| 12 #include "components/mus/public/cpp/window_manager_delegate.h" | 12 #include "components/mus/public/cpp/window_manager_delegate.h" |
| 13 #include "components/mus/public/cpp/window_observer.h" | 13 #include "components/mus/public/cpp/window_observer.h" |
| 14 #include "components/mus/public/cpp/window_tree_delegate.h" | 14 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 15 #include "components/mus/public/interfaces/window_manager.mojom.h" | 15 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 16 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 16 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 17 #include "mash/wm/public/interfaces/container.mojom.h" | 17 #include "mash/wm/public/interfaces/container.mojom.h" |
| 18 #include "mojo/application/public/cpp/application_delegate.h" | 18 #include "mojo/application/public/cpp/application_delegate.h" |
| 19 #include "mojo/application/public/cpp/interface_factory_impl.h" | 19 #include "mojo/application/public/cpp/interface_factory_impl.h" |
| 20 #include "mojo/common/weak_binding_set.h" | 20 #include "mojo/common/weak_binding_set.h" |
| 21 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 21 | 22 |
| 22 class BackgroundLayout; | 23 class BackgroundLayout; |
| 23 class ShelfLayout; | 24 class ShelfLayout; |
| 24 class WindowLayout; | 25 class WindowLayout; |
| 25 class WindowManagerImpl; | 26 class WindowManagerImpl; |
| 26 | 27 |
| 27 namespace ui { | 28 namespace ui { |
| 28 namespace mojo { | 29 namespace mojo { |
| 29 class UIInit; | 30 class UIInit; |
| 30 } | 31 } |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 82 |
| 82 // Sets up the window containers used for z-space management. | 83 // Sets up the window containers used for z-space management. |
| 83 void CreateContainers(); | 84 void CreateContainers(); |
| 84 | 85 |
| 85 // nullptr until the Mus connection is established via OnEmbed(). | 86 // nullptr until the Mus connection is established via OnEmbed(). |
| 86 mus::Window* root_; | 87 mus::Window* root_; |
| 87 int window_count_; | 88 int window_count_; |
| 88 | 89 |
| 89 mojo::ApplicationImpl* app_; | 90 mojo::ApplicationImpl* app_; |
| 90 | 91 |
| 92 mojo::TracingImpl tracing_; |
| 93 |
| 91 mus::mojom::WindowTreeHostPtr host_; | 94 mus::mojom::WindowTreeHostPtr host_; |
| 92 | 95 |
| 93 scoped_ptr<ui::mojo::UIInit> ui_init_; | 96 scoped_ptr<ui::mojo::UIInit> ui_init_; |
| 94 scoped_ptr<views::AuraInit> aura_init_; | 97 scoped_ptr<views::AuraInit> aura_init_; |
| 95 | 98 |
| 96 // |window_manager_| is created once OnEmbed() is called. Until that time | 99 // |window_manager_| is created once OnEmbed() is called. Until that time |
| 97 // |requests_| stores any pending WindowManager interface requests. | 100 // |requests_| stores any pending WindowManager interface requests. |
| 98 scoped_ptr<WindowManagerImpl> window_manager_; | 101 scoped_ptr<WindowManagerImpl> window_manager_; |
| 99 mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_; | 102 mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_; |
| 100 ScopedVector<mojo::InterfaceRequest<mus::mojom::WindowManager>> requests_; | 103 ScopedVector<mojo::InterfaceRequest<mus::mojom::WindowManager>> requests_; |
| 101 | 104 |
| 102 scoped_ptr<BackgroundLayout> background_layout_; | 105 scoped_ptr<BackgroundLayout> background_layout_; |
| 103 scoped_ptr<ShelfLayout> shelf_layout_; | 106 scoped_ptr<ShelfLayout> shelf_layout_; |
| 104 scoped_ptr<WindowLayout> window_layout_; | 107 scoped_ptr<WindowLayout> window_layout_; |
| 105 | 108 |
| 106 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 109 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 107 }; | 110 }; |
| 108 | 111 |
| 109 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 112 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |