| 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/memory/scoped_vector.h" | 14 #include "base/memory/scoped_vector.h" |
| 15 #include "components/mus/common/types.h" | 15 #include "components/mus/common/types.h" |
| 16 #include "components/mus/public/cpp/window_observer.h" | 16 #include "components/mus/public/cpp/window_observer.h" |
| 17 #include "components/mus/public/cpp/window_tree_delegate.h" | 17 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 18 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" | 18 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" |
| 19 #include "components/mus/public/interfaces/window_manager.mojom.h" | 19 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| 20 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 20 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 21 #include "mash/wm/public/interfaces/container.mojom.h" | 21 #include "mash/wm/public/interfaces/container.mojom.h" |
| 22 #include "mojo/application/public/cpp/application_delegate.h" | |
| 23 #include "mojo/application/public/cpp/interface_factory_impl.h" | |
| 24 #include "mojo/common/weak_binding_set.h" | 22 #include "mojo/common/weak_binding_set.h" |
| 25 #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/application_delegate.h" |
| 25 #include "mojo/shell/public/cpp/interface_factory_impl.h" |
| 26 | 26 |
| 27 namespace ui { | 27 namespace ui { |
| 28 namespace mojo { | 28 namespace mojo { |
| 29 class UIInit; | 29 class UIInit; |
| 30 } | 30 } |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace views { | 33 namespace views { |
| 34 class AuraInit; | 34 class AuraInit; |
| 35 } | 35 } |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 | 130 |
| 131 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; | 131 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; |
| 132 | 132 |
| 133 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 133 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 134 }; | 134 }; |
| 135 | 135 |
| 136 } // namespace wm | 136 } // namespace wm |
| 137 } // namespace mash | 137 } // namespace mash |
| 138 | 138 |
| 139 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ | 139 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |