| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_SYSUI_SYSUI_APPLICATION_H_ | 5 #ifndef ASH_SYSUI_SYSUI_APPLICATION_H_ |
| 6 #define ASH_SYSUI_SYSUI_APPLICATION_H_ | 6 #define ASH_SYSUI_SYSUI_APPLICATION_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/sysui/public/interfaces/wallpaper.mojom.h" | 10 #include "ash/sysui/public/interfaces/wallpaper.mojom.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "components/mus/public/cpp/input_devices/input_device_client.h" |
| 12 #include "mash/shelf/public/interfaces/shelf.mojom.h" | 13 #include "mash/shelf/public/interfaces/shelf.mojom.h" |
| 13 #include "mojo/public/cpp/bindings/binding_set.h" | 14 #include "mojo/public/cpp/bindings/binding_set.h" |
| 14 #include "services/shell/public/cpp/shell_client.h" | 15 #include "services/shell/public/cpp/shell_client.h" |
| 15 #include "services/tracing/public/cpp/tracing_impl.h" | 16 #include "services/tracing/public/cpp/tracing_impl.h" |
| 16 | 17 |
| 17 namespace ash { | 18 namespace ash { |
| 18 namespace sysui { | 19 namespace sysui { |
| 19 | 20 |
| 20 class AshInit; | 21 class AshInit; |
| 21 | 22 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 42 void Create(shell::Connection* connection, | 43 void Create(shell::Connection* connection, |
| 43 mojom::WallpaperControllerRequest request) override; | 44 mojom::WallpaperControllerRequest request) override; |
| 44 | 45 |
| 45 mojo::TracingImpl tracing_; | 46 mojo::TracingImpl tracing_; |
| 46 std::unique_ptr<AshInit> ash_init_; | 47 std::unique_ptr<AshInit> ash_init_; |
| 47 | 48 |
| 48 mojo::BindingSet<mash::shelf::mojom::ShelfController> | 49 mojo::BindingSet<mash::shelf::mojom::ShelfController> |
| 49 shelf_controller_bindings_; | 50 shelf_controller_bindings_; |
| 50 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_; | 51 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_; |
| 51 | 52 |
| 53 // Subscribes to updates about input-devices. |
| 54 input_device::InputDeviceClient input_device_client_; |
| 55 |
| 52 DISALLOW_COPY_AND_ASSIGN(SysUIApplication); | 56 DISALLOW_COPY_AND_ASSIGN(SysUIApplication); |
| 53 }; | 57 }; |
| 54 | 58 |
| 55 } // namespace sysui | 59 } // namespace sysui |
| 56 } // namespace ash | 60 } // namespace ash |
| 57 | 61 |
| 58 #endif // ASH_SYSUI_SYSUI_APPLICATION_H_ | 62 #endif // ASH_SYSUI_SYSUI_APPLICATION_H_ |
| OLD | NEW |