Move shell service to toplevel shell namespace

ui/views/mus/window_manager_connection.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 "ui/views/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 13 matching lines @@
 using WindowManagerConnectionPtr =
     base::ThreadLocalPointer<views::WindowManagerConnection>;
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<WindowManagerConnectionPtr>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
-void WindowManagerConnection::Create(mojo::Connector* connector) {
+void WindowManagerConnection::Create(shell::Connector* connector) {
   DCHECK(!lazy_tls_ptr.Pointer()->Get());
   lazy_tls_ptr.Pointer()->Set(new WindowManagerConnection(connector));
 }
 
 // static
 WindowManagerConnection* WindowManagerConnection::Get() {
   WindowManagerConnection* connection = lazy_tls_ptr.Pointer()->Get();
   DCHECK(connection);
   return connection;
 }
@@ skipping 17 matching lines @@
 NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
     const std::map<std::string, std::vector<uint8_t>>& props,
     const Widget::InitParams& init_params,
     internal::NativeWidgetDelegate* delegate) {
   std::map<std::string, std::vector<uint8_t>> properties = props;
   NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
   return new NativeWidgetMus(delegate, connector_, NewWindow(properties),
                              mus::mojom::SurfaceType::DEFAULT);
 }
 
-WindowManagerConnection::WindowManagerConnection(mojo::Connector* connector)
+WindowManagerConnection::WindowManagerConnection(shell::Connector* connector)
     : connector_(connector), window_tree_connection_(nullptr) {
   window_tree_connection_.reset(
       mus::WindowTreeConnection::Create(this, connector_));
 
   screen_.reset(new ScreenMus(this));
   screen_->Init(connector);
 
   // TODO(sad): We should have a DeviceDataManager implementation that talks to
   // a mojo service to learn about the input-devices on the system.
   // http://crbug.com/601981
@@ skipping 17 matching lines @@
 
 void WindowManagerConnection::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (window_tree_connection_)
     NativeWidgetMus::NotifyFrameChanged(window_tree_connection_.get());
 }
 
 }  // namespace views