Move shell service to toplevel shell namespace

components/mus/demo/mus_demo.h

 // Copyright 2016 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_DEMO_MUS_DEMO_H_
 #define COMPONENTS_MUS_DEMO_MUS_DEMO_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 
 namespace bitmap_uploader {
 class BitmapUploader;
 }
 
 namespace mus_demo {
 
 // A simple MUS Demo mojo app. This app connects to the mojo:mus, creates a new
 // window and draws a spinning square in the center of the window. Provides a
 // simple way to demonstrate that the graphic stack works as intended.
-class MusDemo : public mojo::ShellClient,
+class MusDemo : public shell::ShellClient,
                 public mus::WindowTreeDelegate,
                 public mus::WindowManagerDelegate {
  public:
   MusDemo();
   ~MusDemo() override;
 
  private:
-  // mojo::ShellClient:
-  void Initialize(mojo::Connector* connector,
-                  const mojo::Identity& identity,
+  // shell::ShellClient:
+  void Initialize(shell::Connector* connector,
+                  const shell::Identity& identity,
                   uint32_t id) override;
-  bool AcceptConnection(mojo::Connection* connection) override;
+  bool AcceptConnection(shell::Connection* connection) override;
 
   // WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnUnembed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(mus::WindowManagerClient* client) override;
   bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(mus::Window* window,
                        const std::string& name,
                        scoped_ptr<std::vector<uint8_t>>* new_data) override;
   mus::Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
   void OnAccelerator(uint32_t id, const ui::Event& event) override;
 
   // Allocate a bitmap the same size as the window to draw into.
   void AllocBitmap();
 
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
 
-  mojo::Connector* connector_ = nullptr;
+  shell::Connector* connector_ = nullptr;
 
   mus::Window* window_ = nullptr;
   mus::mojom::WindowTreeHostPtr window_tree_host_;
 
   // Used to send frames to mus.
   scoped_ptr<bitmap_uploader::BitmapUploader> uploader_;
 
   // Bitmap that is the same size as our client window area.
   SkBitmap bitmap_;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace mus_demo
 
 #endif  // COMPONENTS_MUS_DEMO_MUS_DEMO_H_