| 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 13 matching lines...) Expand all Loading... |
| 24 class TouchHudApplication | 24 class TouchHudApplication |
| 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(shell::Connector* connector, | 34 void OnStart(const shell::Identity& identity) override; |
| 35 const shell::Identity& identity, | |
| 36 uint32_t id) override; | |
| 37 bool OnConnect(shell::Connection* connection) override; | 35 bool OnConnect(shell::Connection* connection) override; |
| 38 | 36 |
| 39 // mojom::Launchable: | 37 // mojom::Launchable: |
| 40 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; | 38 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; |
| 41 | 39 |
| 42 // shell::InterfaceFactory<mojom::Launchable>: | 40 // shell::InterfaceFactory<mojom::Launchable>: |
| 43 void Create(const shell::Identity& remote_identity, | 41 void Create(const shell::Identity& remote_identity, |
| 44 mash::mojom::LaunchableRequest request) override; | 42 mash::mojom::LaunchableRequest request) override; |
| 45 | 43 |
| 46 shell::Connector* connector_ = nullptr; | |
| 47 mojo::Binding<mash::mojom::Launchable> binding_; | 44 mojo::Binding<mash::mojom::Launchable> binding_; |
| 48 views::Widget* widget_ = nullptr; | 45 views::Widget* widget_ = nullptr; |
| 49 | 46 |
| 50 std::unique_ptr<views::AuraInit> aura_init_; | 47 std::unique_ptr<views::AuraInit> aura_init_; |
| 51 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 48 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
| 52 | 49 |
| 53 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); | 50 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); |
| 54 }; | 51 }; |
| 55 | 52 |
| 56 } // namespace touch_hud | 53 } // namespace touch_hud |
| 57 } // namespace ash | 54 } // namespace ash |
| 58 | 55 |
| 59 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 56 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |
| OLD | NEW |