Index: mash/example/window_type_launcher/window_type_launcher.h |
diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h |
index d19e752dbbdb2cd63ab29d0c5eb3b4ebb9d3442c..f176bd2a0aa39440110703d4d03ad9b00947b858 100644 |
--- a/mash/example/window_type_launcher/window_type_launcher.h |
+++ b/mash/example/window_type_launcher/window_type_launcher.h |
@@ -19,9 +19,9 @@ class WindowManagerConnection; |
} |
class WindowTypeLauncher |
- : 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: |
WindowTypeLauncher(); |
~WindowTypeLauncher() override; |
@@ -29,16 +29,16 @@ class WindowTypeLauncher |
void RemoveWindow(views::Widget* window); |
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; |
// mash::mojom::Launchable: |
void Launch(uint32_t what, mash::mojom::LaunchMode how) override; |
- // shell::InterfaceFactory<mash::mojom::Launchable>: |
- void Create(const shell::Identity& remote_identity, |
+ // service_manager::InterfaceFactory<mash::mojom::Launchable>: |
+ void Create(const service_manager::Identity& remote_identity, |
mash::mojom::LaunchableRequest request) override; |
mojo::BindingSet<mash::mojom::Launchable> bindings_; |