Index: mash/catalog_viewer/catalog_viewer.h |
diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/catalog_viewer/catalog_viewer.h |
index 563d39ea3435ab691236a77bde02124f490658be..b120c7e0d7e45102a60dd18fde4efc0a0b55f4d0 100644 |
--- a/mash/catalog_viewer/catalog_viewer.h |
+++ b/mash/catalog_viewer/catalog_viewer.h |
@@ -24,9 +24,10 @@ class WindowManagerConnection; |
namespace mash { |
namespace catalog_viewer { |
-class CatalogViewer : public shell::Service, |
- public mojom::Launchable, |
- public shell::InterfaceFactory<mojom::Launchable> { |
+class CatalogViewer |
+ : public service_manager::Service, |
+ public mojom::Launchable, |
+ public service_manager::InterfaceFactory<mojom::Launchable> { |
public: |
CatalogViewer(); |
~CatalogViewer() override; |
@@ -34,16 +35,16 @@ class CatalogViewer : public shell::Service, |
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; |
// mojom::Launchable: |
void Launch(uint32_t what, 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, |
mojom::LaunchableRequest request) override; |
mojo::BindingSet<mojom::Launchable> bindings_; |