Move shell service to toplevel shell namespace

components/mus/ws/platform_display.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 COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 #define COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 17 matching lines @@
 class CompositorFrame;
 class CopyOutputRequest;
 class SurfaceIdAllocator;
 class SurfaceManager;
 }  // namespace cc
 
 namespace gles2 {
 class GpuState;
 }  // namespace gles2
 
-namespace mojo {
+namespace shell {
 class Connector;
-}  // namespace mojo
+}  // namespace shell
 
 namespace ui {
 class CursorLoader;
 class PlatformWindow;
 struct TextInputState;
 }  // namespace ui
 
 namespace mus {
 
 class GpuState;
@@ skipping 99 matching lines @@
   void DispatchEvent(ui::Event* event) override;
   void OnCloseRequest() override;
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_pixel_ratio) override;
   void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
-  mojo::Connector* connector_;
+  shell::Connector* connector_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
   PlatformDisplayDelegate* delegate_;
 
   mojom::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_;
 
   scoped_ptr<TopLevelDisplayClient> top_level_display_client_;
   scoped_ptr<ui::PlatformWindow> platform_window_;
 
 #if !defined(OS_ANDROID)
   scoped_ptr<ui::CursorLoader> cursor_loader_;
 #endif
 
   base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_