Index: mash/task_viewer/task_viewer.h |
diff --git a/mash/task_viewer/task_viewer.h b/mash/task_viewer/task_viewer.h |
index f8f117bb0136e327bce0decb215b1c926af1bf08..21b440f3b480884fbe6591e8e1ad236907512365 100644 |
--- a/mash/task_viewer/task_viewer.h |
+++ b/mash/task_viewer/task_viewer.h |
@@ -24,9 +24,9 @@ class WindowManagerConnection; |
namespace mash { |
namespace task_viewer { |
-class TaskViewer : public shell::Service, |
+class TaskViewer : public service_manager::Service, |
public mojom::Launchable, |
- public shell::InterfaceFactory<mojom::Launchable> { |
+ public service_manager::InterfaceFactory<mojom::Launchable> { |
public: |
TaskViewer(); |
~TaskViewer() override; |
@@ -34,16 +34,16 @@ class TaskViewer : public shell::Service, |
void RemoveWindow(views::Widget* widget); |
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_; |