| 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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <set> | 11 #include <set> |
| 12 | 12 |
| 13 #include "ash/mus/window_manager_observer.h" | 13 #include "ash/mus/window_manager_observer.h" |
| 14 #include "ash/public/interfaces/shelf_layout.mojom.h" | 14 #include "ash/public/interfaces/shelf_layout.mojom.h" |
| 15 #include "ash/public/interfaces/user_window_controller.mojom.h" | 15 #include "ash/public/interfaces/user_window_controller.mojom.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "components/mus/common/types.h" | |
| 18 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" | |
| 19 #include "mash/session/public/interfaces/session.mojom.h" | 17 #include "mash/session/public/interfaces/session.mojom.h" |
| 20 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" |
| 21 #include "mojo/public/cpp/bindings/binding_set.h" | 19 #include "mojo/public/cpp/bindings/binding_set.h" |
| 22 #include "services/shell/public/cpp/shell_client.h" | 20 #include "services/shell/public/cpp/shell_client.h" |
| 23 #include "services/tracing/public/cpp/tracing_impl.h" | 21 #include "services/tracing/public/cpp/tracing_impl.h" |
| 22 #include "services/ui/common/types.h" |
| 23 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" |
| 24 | 24 |
| 25 namespace mus { | 25 namespace mus { |
| 26 class WindowTreeClient; | 26 class WindowTreeClient; |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace views { | 29 namespace views { |
| 30 class AuraInit; | 30 class AuraInit; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace ui { | 33 namespace ui { |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 mojo::Binding<mash::session::mojom::ScreenlockStateListener> | 126 mojo::Binding<mash::session::mojom::ScreenlockStateListener> |
| 127 screenlock_state_listener_binding_; | 127 screenlock_state_listener_binding_; |
| 128 | 128 |
| 129 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); | 129 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); |
| 130 }; | 130 }; |
| 131 | 131 |
| 132 } // namespace mus | 132 } // namespace mus |
| 133 } // namespace ash | 133 } // namespace ash |
| 134 | 134 |
| 135 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ | 135 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ |
| OLD | NEW |