| Index: mash/quick_launch/quick_launch.h
|
| diff --git a/mash/quick_launch/quick_launch.h b/mash/quick_launch/quick_launch.h
|
| index e4848756ce7a0e0b2f341dc74c8bed05598e4569..a543f99632b4ad3c5ef3b47705f23afc0bb71035 100644
|
| --- a/mash/quick_launch/quick_launch.h
|
| +++ b/mash/quick_launch/quick_launch.h
|
| @@ -25,8 +25,8 @@ namespace quick_launch {
|
|
|
| class QuickLaunch
|
| : public service_manager::Service,
|
| - public mojom::Launchable,
|
| - public service_manager::InterfaceFactory<mojom::Launchable> {
|
| + public ::mash::mojom::Launchable,
|
| + public service_manager::InterfaceFactory<::mash::mojom::Launchable> {
|
| public:
|
| QuickLaunch();
|
| ~QuickLaunch() override;
|
| @@ -39,14 +39,14 @@ class QuickLaunch
|
| 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_;
|
|
|