Index: ash/mus/window_manager_application.cc |
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc |
index 5c48c9403505cfe9fba3701cce5f5efddf565937..12f597ee011daa976b2aca6d5dd22135883b9a1a 100644 |
--- a/ash/mus/window_manager_application.cc |
+++ b/ash/mus/window_manager_application.cc |
@@ -130,7 +130,8 @@ void WindowManagerApplication::ShutdownComponents() { |
message_center::MessageCenter::Shutdown(); |
} |
-void WindowManagerApplication::OnStart(const shell::Identity& identity) { |
+void WindowManagerApplication::OnStart( |
+ const service_manager::Identity& identity) { |
aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak", |
"ash_mus_resources_200.pak")); |
gpu_service_ = ui::GpuService::Create(connector()); |
@@ -156,8 +157,9 @@ void WindowManagerApplication::OnStart(const shell::Identity& identity) { |
InitWindowManager(std::move(window_tree_client), blocking_pool_); |
} |
-bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity, |
- shell::InterfaceRegistry* registry) { |
+bool WindowManagerApplication::OnConnect( |
+ const service_manager::Identity& remote_identity, |
+ service_manager::InterfaceRegistry* registry) { |
// Register services used in both classic ash and mash. |
mojo_interface_factory::RegisterInterfaces( |
registry, base::ThreadTaskRunnerHandle::Get()); |
@@ -173,7 +175,7 @@ bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity, |
} |
void WindowManagerApplication::Create( |
- const ::shell::Identity& remote_identity, |
+ const ::service_manager::Identity& remote_identity, |
mojom::WallpaperControllerRequest request) { |
mojom::WallpaperController* wallpaper_controller = |
static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate()); |
@@ -183,7 +185,7 @@ void WindowManagerApplication::Create( |
} |
void WindowManagerApplication::Create( |
- const shell::Identity& remote_identity, |
+ const service_manager::Identity& remote_identity, |
ui::mojom::AcceleratorRegistrarRequest request) { |
if (!window_manager_->window_manager_client()) |
return; // Can happen during shutdown. |