Rename shell namespace to service_manager

ui/ozone/public/ozone_platform.h

 // Copyright 2014 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 UI_OZONE_PUBLIC_OZONE_PLATFORM_H_
 #define UI_OZONE_PUBLIC_OZONE_PLATFORM_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "ui/ozone/ozone_export.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace IPC {
 class MessageFilter;
 }
 
-namespace shell {
+namespace service_manager {
 class Connector;
 class InterfaceRegistry;
 }
 
 namespace ui {
 
 class CursorFactoryOzone;
 class InputController;
 class GpuPlatformSupportHost;
 class NativeDisplayDelegate;
@@ skipping 21 matching lines @@
  public:
   OzonePlatform();
   virtual ~OzonePlatform();
 
   // Additional initialization params for the platform. Platforms must not
   // retain a reference to this structure.
   struct InitParams {
     // Ozone may retain this pointer for later use. An Ozone platform embedder
     // must set this parameter in order for the Ozone platform implementation to
     // be able to use Mojo.
-    shell::Connector* connector = nullptr;
+    service_manager::Connector* connector = nullptr;
 
     // Setting this to true indicates that the platform implementation should
     // operate as a single process for platforms (i.e. drm) that are usually
     // split between a main and gpu specific portion.
     bool single_process = false;
   };
 
   // Initializes the subsystems/resources necessary for the UI process (e.g.
   // events, etc.)
   // TODO(rjkroege): Remove deprecated entry point (http://crbug.com/620934)
@@ skipping 27 matching lines @@
   virtual std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() = 0;
   virtual std::unique_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) = 0;
   virtual std::unique_ptr<ui::NativeDisplayDelegate>
   CreateNativeDisplayDelegate() = 0;
 
   // Ozone platform implementations may also choose to expose mojo interfaces to
   // internal functionality. Embedders wishing to take advantage of ozone mojo
   // implementations must invoke AddInterfaces with a valid
-  // shell::InterfaceRegistry* pointer to export all Mojo interfaces defined
-  // within Ozone.
+  // service_manager::InterfaceRegistry* pointer to export all Mojo interfaces
+  // defined within Ozone.
   //
   // A default do-nothing implementation is provided to permit platform
   // implementations to opt out of implementing any Mojo interfaces.
-  virtual void AddInterfaces(shell::InterfaceRegistry* registry);
+  virtual void AddInterfaces(service_manager::InterfaceRegistry* registry);
 
  private:
   virtual void InitializeUI() = 0;
   virtual void InitializeGPU() = 0;
   virtual void InitializeUI(const InitParams& args);
   virtual void InitializeGPU(const InitParams& args);
 
   static void CreateInstance();
 
   static OzonePlatform* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatform);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PUBLIC_OZONE_PLATFORM_H_