Move shell service to toplevel shell namespace

ui/views/mus/screen_mus.cc

 // 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.
 
 #include "ui/views/mus/screen_mus.h"
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/gfx/display_finder.h"
@@ skipping 56 matching lines @@
 
 namespace views {
 
 ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
     : delegate_(delegate),
       primary_display_index_(0),
       display_manager_observer_binding_(this) {}
 
 ScreenMus::~ScreenMus() {}
 
-void ScreenMus::Init(mojo::Connector* connector) {
+void ScreenMus::Init(shell::Connector* connector) {
   gfx::Screen::SetScreenInstance(this);
 
   connector->ConnectToInterface("mojo:mus", &display_manager_);
 
   display_manager_->AddObserver(
       display_manager_observer_binding_.CreateInterfacePtrAndBind());
 
   // We need the set of displays before we can continue. Wait for it.
   //
   // TODO(rockot): Do something better here. This should not have to block tasks
@@ skipping 140 matching lines @@
   DCHECK_NE(-1, index);
   // Another display must become primary before the existing primary is
   // removed.
   DCHECK_NE(index, primary_display_index_);
   const gfx::Display display = displays_[index];
   FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
                     OnDisplayRemoved(display));
 }
 
 }  // namespace views