Eliminate mojo::Shell client lib class

mash/wm/window_manager.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 "mash/wm/window_manager.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "components/mus/common/types.h"
@@ skipping 95 matching lines @@
 
   // TODO(sky): constrain and validate properties before passing to server.
   mus::Window* window = root->connection()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
 
   mojom::Container container = GetRequestedContainer(window);
   root_controller_->GetWindowForContainer(container)->AddChild(window);
 
   if (provide_non_client_frame) {
     // NonClientFrameController deletes itself when |window| is destroyed.
-    new NonClientFrameController(root_controller_->GetShell(), window,
+    new NonClientFrameController(root_controller_->GetConnector(), window,
                                  root_controller_->window_manager_client());
   }
 
   root_controller_->IncrementWindowCount();
 
   return window;
 }
 
 void WindowManager::OnTreeChanging(const TreeChangeParams& params) {
   DCHECK(root_controller_);
@@ skipping 39 matching lines @@
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
       mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash