Rename shell namespace to service_manager

ash/mus/window_manager_application.h

 // 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.
 
 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 34 matching lines @@
 namespace ash {
 namespace mus {
 
 class AcceleratorRegistrarImpl;
 class NativeWidgetFactoryMus;
 class NetworkConnectDelegateMus;
 class WindowManager;
 
 // Hosts the window manager and the ash system user interface for mash.
 class WindowManagerApplication
-    : public shell::Service,
-      public shell::InterfaceFactory<mojom::WallpaperController>,
-      public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
+    : public service_manager::Service,
+      public service_manager::InterfaceFactory<mojom::WallpaperController>,
+      public service_manager::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
       public mash::session::mojom::ScreenlockStateListener {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
   mash::session::mojom::Session* session() { return session_.get(); }
 
  private:
   friend class WmTestBase;
   friend class WmTestHelper;
 
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   void InitWindowManager(
       std::unique_ptr<ui::WindowTreeClient> window_tree_client,
       const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
 
   // Initializes lower-level OS-specific components (e.g. D-Bus services).
   void InitializeComponents();
   void ShutdownComponents();
 
-  // 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;
 
   // InterfaceFactory<mojom::WallpaperController>:
-  void Create(const shell::Identity& remote_identity,
+  void Create(const service_manager::Identity& remote_identity,
               mojom::WallpaperControllerRequest request) override;
 
-  // shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:
-  void Create(const shell::Identity& remote_identity,
+  // service_manager::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:
+  void Create(const service_manager::Identity& remote_identity,
               ui::mojom::AcceleratorRegistrarRequest request) override;
 
   // session::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
   tracing::Provider tracing_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
   std::unique_ptr<NativeWidgetFactoryMus> native_widget_factory_mus_;
 
@@ skipping 19 matching lines @@
       statistics_provider_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_