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" |
(...skipping 14 matching lines...) Expand all Loading... |
25 : public shell::Service, | 25 : public shell::Service, |
26 public mash::mojom::Launchable, | 26 public mash::mojom::Launchable, |
27 public shell::InterfaceFactory<mash::mojom::Launchable> { | 27 public shell::InterfaceFactory<mash::mojom::Launchable> { |
28 public: | 28 public: |
29 TouchHudApplication(); | 29 TouchHudApplication(); |
30 ~TouchHudApplication() override; | 30 ~TouchHudApplication() override; |
31 | 31 |
32 private: | 32 private: |
33 // shell::Service: | 33 // shell::Service: |
34 void OnStart(const shell::Identity& identity) override; | 34 void OnStart(const shell::Identity& identity) override; |
35 bool OnConnect(shell::Connection* connection) override; | 35 bool OnConnect(const shell::Identity& remote_identity, |
| 36 shell::InterfaceRegistry* registry) override; |
36 | 37 |
37 // mojom::Launchable: | 38 // mojom::Launchable: |
38 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; | 39 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; |
39 | 40 |
40 // shell::InterfaceFactory<mojom::Launchable>: | 41 // shell::InterfaceFactory<mojom::Launchable>: |
41 void Create(const shell::Identity& remote_identity, | 42 void Create(const shell::Identity& remote_identity, |
42 mash::mojom::LaunchableRequest request) override; | 43 mash::mojom::LaunchableRequest request) override; |
43 | 44 |
44 mojo::Binding<mash::mojom::Launchable> binding_; | 45 mojo::Binding<mash::mojom::Launchable> binding_; |
45 views::Widget* widget_ = nullptr; | 46 views::Widget* widget_ = nullptr; |
46 | 47 |
47 std::unique_ptr<views::AuraInit> aura_init_; | 48 std::unique_ptr<views::AuraInit> aura_init_; |
48 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 49 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
49 | 50 |
50 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); | 51 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); |
51 }; | 52 }; |
52 | 53 |
53 } // namespace touch_hud | 54 } // namespace touch_hud |
54 } // namespace ash | 55 } // namespace ash |
55 | 56 |
56 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 57 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |
OLD | NEW |