Rename shell namespace to service_manager

ash/mus/window_manager_application.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/mojo_interface_factory.h"
@@ skipping 112 matching lines @@
   chromeos::CrasAudioHandler::Shutdown();
   ui::NetworkConnect::Shutdown();
   network_connect_delegate_.reset();
   chromeos::NetworkHandler::Shutdown();
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
   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());
   compositor_context_factory_.reset(
       new views::SurfaceContextFactory(gpu_service_.get()));
   aura::Env::GetInstance()->set_context_factory(
       compositor_context_factory_.get());
   window_manager_.reset(new WindowManager(connector()));
 
   MaterialDesignController::Initialize();
 
   tracing_.Initialize(connector(), identity.name());
 
   std::unique_ptr<ui::WindowTreeClient> window_tree_client =
       base::MakeUnique<ui::WindowTreeClient>(window_manager_.get(),
                                              window_manager_.get());
   window_tree_client->ConnectAsWindowManager(connector());
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlocking";
   blocking_pool_ = new base::SequencedWorkerPool(
       kMaxNumberThreads, kThreadNamePrefix, base::TaskPriority::USER_VISIBLE);
   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());
 
   registry->AddInterface<mojom::WallpaperController>(this);
   registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
   if (remote_identity.name() == "service:mash_session") {
     connector()->ConnectToInterface(remote_identity, &session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
   }
   return true;
 }
 
 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());
   DCHECK(wallpaper_controller);
   wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
                                             std::move(request));
 }
 
 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.
 
   uint16_t accelerator_namespace_id;
   if (!window_manager_->GetNextAcceleratorNamespaceId(
           &accelerator_namespace_id)) {
     DVLOG(1) << "Max number of accelerators registered, ignoring request.";
     // All ids are used. Normally shouldn't happen, so we close the connection.
     return;
   }
   accelerator_registrars_.insert(new AcceleratorRegistrarImpl(
       window_manager_.get(), accelerator_namespace_id, std::move(request),
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
   window_manager_->SetScreenLocked(locked);
 }
 
 }  // namespace mus
 }  // namespace ash