Chromium Code Reviews| 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_set.h" |
| 13 #include "services/shell/public/cpp/service.h" | 13 #include "services/shell/public/cpp/service.h" |
| 14 | 14 |
| 15 namespace views { | 15 namespace views { |
| 16 class AuraInit; | 16 class AuraInit; |
| 17 class Widget; | 17 class Widget; |
| 18 class WindowManagerConnection; | 18 class WindowManagerConnection; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 namespace touch_hud { | 22 namespace touch_hud { |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 35 bool OnConnect(const shell::Identity& remote_identity, | 35 bool OnConnect(const shell::Identity& remote_identity, |
| 36 shell::InterfaceRegistry* registry) override; | 36 shell::InterfaceRegistry* registry) override; |
| 37 | 37 |
| 38 // mojom::Launchable: | 38 // mojom::Launchable: |
| 39 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; | 39 void Launch(uint32_t what, mash::mojom::LaunchMode how) override; |
| 40 | 40 |
| 41 // shell::InterfaceFactory<mojom::Launchable>: | 41 // shell::InterfaceFactory<mojom::Launchable>: |
| 42 void Create(const shell::Identity& remote_identity, | 42 void Create(const shell::Identity& remote_identity, |
| 43 mash::mojom::LaunchableRequest request) override; | 43 mash::mojom::LaunchableRequest request) override; |
| 44 | 44 |
| 45 mojo::Binding<mash::mojom::Launchable> binding_; | 45 mojo::BindingSet<mash::mojom::Launchable> bindings_; |
|
sadrul
2016/09/02 00:52:28
Why would we need a BindingSet<>?
riajiang
2016/09/02 18:18:38
As discussed, changing back to Binding.
| |
| 46 views::Widget* widget_ = nullptr; | 46 views::Widget* widget_ = nullptr; |
| 47 | 47 |
| 48 std::unique_ptr<views::AuraInit> aura_init_; | 48 std::unique_ptr<views::AuraInit> aura_init_; |
| 49 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 49 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
| 50 | 50 |
| 51 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); | 51 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 } // namespace touch_hud | 54 } // namespace touch_hud |
| 55 } // namespace ash | 55 } // namespace ash |
| 56 | 56 |
| 57 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 57 #endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |
| OLD | NEW |