Rename shell namespace to service_manager

ash/mus/root_window_controller.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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 66 matching lines @@
   Shutdown();
   root_->Destroy();
 }
 
 void RootWindowController::Shutdown() {
   // NOTE: Shutdown() may be called multiple times.
   wm_root_window_controller_->ResetRootForNewWindowsIfNecessary();
   wm_root_window_controller_->CloseChildWindows();
 }
 
-shell::Connector* RootWindowController::GetConnector() {
+service_manager::Connector* RootWindowController::GetConnector() {
   return window_manager_->connector();
 }
 
 ui::Window* RootWindowController::NewTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   const bool provide_non_client_frame =
       GetWindowType(*properties) == ui::mojom::WindowType::WINDOW ||
       GetWindowType(*properties) == ui::mojom::WindowType::PANEL;
   if (provide_non_client_frame)
     (*properties)[ui::mojom::kWaitForUnderlay_Property].clear();
@@ skipping 82 matching lines @@
 void RootWindowController::CreateLayoutManagers() {
   // Override the default layout managers for certain containers.
   WmWindowMus* lock_screen_container =
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 }
 
 }  // namespace mus
 }  // namespace ash