| 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> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
| 15 #include "components/mus/common/types.h" | 15 #include "components/mus/common/types.h" |
| 16 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" | 16 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" |
| 17 #include "components/mus/public/interfaces/window_manager.mojom.h" | 17 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 18 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" | 18 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" |
| 19 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 19 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 20 #include "mash/wm/public/interfaces/user_window_controller.mojom.h" | 20 #include "mash/wm/public/interfaces/user_window_controller.mojom.h" |
| 21 #include "mojo/public/cpp/bindings/binding.h" | 21 #include "mojo/public/cpp/bindings/binding.h" |
| 22 #include "mojo/public/cpp/bindings/weak_binding_set.h" | 22 #include "mojo/public/cpp/bindings/binding_set.h" |
| 23 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 23 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 24 #include "mojo/shell/public/cpp/shell_client.h" | 24 #include "mojo/shell/public/cpp/shell_client.h" |
| 25 | 25 |
| 26 namespace ui { | 26 namespace ui { |
| 27 namespace mojo { | 27 namespace mojo { |
| 28 class UIInit; | 28 class UIInit; |
| 29 } | 29 } |
| 30 } | 30 } |
| 31 | 31 |
| 32 namespace views { | 32 namespace views { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 mojo::Shell* shell_; | 100 mojo::Shell* shell_; |
| 101 | 101 |
| 102 mojo::TracingImpl tracing_; | 102 mojo::TracingImpl tracing_; |
| 103 | 103 |
| 104 scoped_ptr<ui::mojo::UIInit> ui_init_; | 104 scoped_ptr<ui::mojo::UIInit> ui_init_; |
| 105 scoped_ptr<views::AuraInit> aura_init_; | 105 scoped_ptr<views::AuraInit> aura_init_; |
| 106 | 106 |
| 107 // |user_window_controller_| is created once OnEmbed() is called. Until that | 107 // |user_window_controller_| is created once OnEmbed() is called. Until that |
| 108 // time |user_window_controller_requests_| stores pending interface requests. | 108 // time |user_window_controller_requests_| stores pending interface requests. |
| 109 scoped_ptr<UserWindowControllerImpl> user_window_controller_; | 109 scoped_ptr<UserWindowControllerImpl> user_window_controller_; |
| 110 mojo::WeakBindingSet<mash::wm::mojom::UserWindowController> | 110 mojo::BindingSet<mash::wm::mojom::UserWindowController> |
| 111 user_window_controller_binding_; | 111 user_window_controller_binding_; |
| 112 std::vector< | 112 std::vector< |
| 113 scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>> | 113 scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>> |
| 114 user_window_controller_requests_; | 114 user_window_controller_requests_; |
| 115 | 115 |
| 116 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; | 116 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; |
| 117 std::set<RootWindowController*> root_controllers_; | 117 std::set<RootWindowController*> root_controllers_; |
| 118 | 118 |
| 119 mojo::Binding<mus::mojom::WindowManagerFactory> | 119 mojo::Binding<mus::mojom::WindowManagerFactory> |
| 120 window_manager_factory_binding_; | 120 window_manager_factory_binding_; |
| 121 | 121 |
| 122 base::ObserverList<RootWindowsObserver> root_windows_observers_; | 122 base::ObserverList<RootWindowsObserver> root_windows_observers_; |
| 123 | 123 |
| 124 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 124 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 } // namespace wm | 127 } // namespace wm |
| 128 } // namespace mash | 128 } // namespace mash |
| 129 | 129 |
| 130 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 130 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |