Index: ash/touch_hud/mus/touch_hud_application.h |
diff --git a/ash/touch_hud/mus/touch_hud_application.h b/ash/touch_hud/mus/touch_hud_application.h |
index 07b5426fa35f316373e5406fb1ec6a2d7eeb187a..94266bef8cfa22cc3b19ccd13137adb3bc69d121 100644 |
--- a/ash/touch_hud/mus/touch_hud_application.h |
+++ b/ash/touch_hud/mus/touch_hud_application.h |
@@ -22,24 +22,24 @@ namespace ash { |
namespace touch_hud { |
class TouchHudApplication |
- : public shell::Service, |
+ : public service_manager::Service, |
public mash::mojom::Launchable, |
- public shell::InterfaceFactory<mash::mojom::Launchable> { |
+ public service_manager::InterfaceFactory<mash::mojom::Launchable> { |
public: |
TouchHudApplication(); |
~TouchHudApplication() override; |
private: |
- // shell::Service: |
- void OnStart(const shell::Identity& identity) override; |
- bool OnConnect(const shell::Identity& remote_identity, |
- shell::InterfaceRegistry* registry) override; |
+ // service_manager::Service: |
+ void OnStart(const service_manager::Identity& identity) override; |
+ bool OnConnect(const service_manager::Identity& remote_identity, |
+ service_manager::InterfaceRegistry* registry) override; |
// mojom::Launchable: |
void Launch(uint32_t what, mash::mojom::LaunchMode how) override; |
- // shell::InterfaceFactory<mojom::Launchable>: |
- void Create(const shell::Identity& remote_identity, |
+ // service_manager::InterfaceFactory<mojom::Launchable>: |
+ void Create(const service_manager::Identity& remote_identity, |
mash::mojom::LaunchableRequest request) override; |
mojo::Binding<mash::mojom::Launchable> binding_; |