| 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_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 5 #ifndef ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |
| 6 #define ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 6 #define ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "mash/public/interfaces/launchable.mojom.h" | 11 #include "mash/public/interfaces/launchable.mojom.h" |
| 12 #include "mojo/public/cpp/bindings/binding.h" | 12 #include "mojo/public/cpp/bindings/binding.h" |
| 13 #include "services/service_manager/public/cpp/interface_factory.h" | 13 #include "services/service_manager/public/cpp/interface_factory.h" |
| 14 #include "services/service_manager/public/cpp/service.h" | 14 #include "services/service_manager/public/cpp/service.h" |
| 15 | 15 |
| 16 namespace views { | 16 namespace views { |
| 17 class AuraInit; | 17 class AuraInit; |
| 18 class Widget; | 18 class Widget; |
| 19 class WindowManagerConnection; | |
| 20 } | 19 } |
| 21 | 20 |
| 22 namespace ash { | 21 namespace ash { |
| 23 namespace touch_hud { | 22 namespace touch_hud { |
| 24 | 23 |
| 25 class TouchHudApplication | 24 class TouchHudApplication |
| 26 : public service_manager::Service, | 25 : public service_manager::Service, |
| 27 public mash::mojom::Launchable, | 26 public mash::mojom::Launchable, |
| 28 public service_manager::InterfaceFactory<mash::mojom::Launchable> { | 27 public service_manager::InterfaceFactory<mash::mojom::Launchable> { |
| 29 public: | 28 public: |
| (...skipping 10 matching lines...) Expand all Loading... |
| 40 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; | 39 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; |
| 41 | 40 |
| 42 // service_manager::InterfaceFactory<mojom::Launchable>: | 41 // service_manager::InterfaceFactory<mojom::Launchable>: |
| 43 void Create(const service_manager::Identity& remote_identity, | 42 void Create(const service_manager::Identity& remote_identity, |
| 44 mash::mojom::LaunchableRequest request) override; | 43 mash::mojom::LaunchableRequest request) override; |
| 45 | 44 |
| 46 mojo::Binding<mash::mojom::Launchable> binding_; | 45 mojo::Binding<mash::mojom::Launchable> binding_; |
| 47 views::Widget* widget_ = nullptr; | 46 views::Widget* widget_ = nullptr; |
| 48 | 47 |
| 49 std::unique_ptr<views::AuraInit> aura_init_; | 48 std::unique_ptr<views::AuraInit> aura_init_; |
| 50 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | |
| 51 | 49 |
| 52 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); | 50 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); |
| 53 }; | 51 }; |
| 54 | 52 |
| 55 } // namespace touch_hud | 53 } // namespace touch_hud |
| 56 } // namespace ash | 54 } // namespace ash |
| 57 | 55 |
| 58 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 56 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |
| OLD | NEW |