| Index: mash/task_viewer/task_viewer.h
|
| diff --git a/mash/task_viewer/task_viewer.h b/mash/task_viewer/task_viewer.h
|
| index 1190c34d9d0822e342f4296b4cd8b9dd9f26503f..cf1b8ecdd58dc28eb45da7437f1756175361e794 100644
|
| --- a/mash/task_viewer/task_viewer.h
|
| +++ b/mash/task_viewer/task_viewer.h
|
| @@ -25,9 +25,10 @@ class WindowManagerConnection;
|
| namespace mash {
|
| namespace task_viewer {
|
|
|
| -class TaskViewer : public service_manager::Service,
|
| - public mojom::Launchable,
|
| - public service_manager::InterfaceFactory<mojom::Launchable> {
|
| +class TaskViewer
|
| + : public service_manager::Service,
|
| + public ::mash::mojom::Launchable,
|
| + public service_manager::InterfaceFactory<::mash::mojom::Launchable> {
|
| public:
|
| TaskViewer();
|
| ~TaskViewer() override;
|
| @@ -40,14 +41,14 @@ class TaskViewer : public service_manager::Service,
|
| bool OnConnect(const service_manager::ServiceInfo& remote_info,
|
| service_manager::InterfaceRegistry* registry) override;
|
|
|
| - // mojom::Launchable:
|
| - void Launch(uint32_t what, mojom::LaunchMode how) override;
|
| + // ::mash::mojom::Launchable:
|
| + void Launch(uint32_t what, ::mash::mojom::LaunchMode how) override;
|
|
|
| - // service_manager::InterfaceFactory<mojom::Launchable>:
|
| + // service_manager::InterfaceFactory<::mash::mojom::Launchable>:
|
| void Create(const service_manager::Identity& remote_identity,
|
| - mojom::LaunchableRequest request) override;
|
| + ::mash::mojom::LaunchableRequest request) override;
|
|
|
| - mojo::BindingSet<mojom::Launchable> bindings_;
|
| + mojo::BindingSet<::mash::mojom::Launchable> bindings_;
|
| std::vector<views::Widget*> windows_;
|
|
|
| tracing::Provider tracing_;
|
|
|