Move shell service to toplevel shell namespace

mash/wm/non_client_frame_controller.h

 // 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.
 
 #ifndef MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
 #define MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace gfx {
 class Insets;
 }
 
-namespace mojo {
-class Connector;
-}
-
 namespace mus {
 class Window;
 class WindowManagerClient;
 }
 
+namespace shell {
+class Connector;
+}
+
 namespace mash {
 namespace wm {
 
 // Provides the non-client frame for mus Windows.
 class NonClientFrameController : public views::WidgetDelegateView,
                                  public mus::WindowObserver {
  public:
   // NonClientFrameController deletes itself when |window| is destroyed.
-  static void Create(mojo::Connector* connector,
+  static void Create(shell::Connector* connector,
                      mus::Window* window,
                      mus::WindowManagerClient* window_manager_client);
 
   // Returns the preferred client area insets.
   static gfx::Insets GetPreferredClientAreaInsets();
 
   // Returns the width needed to display the standard set of buttons on the
   // title bar.
   static int GetMaxTitleBarButtonWidth();
 
   mus::Window* window() { return window_; }
 
  private:
-  NonClientFrameController(mojo::Connector* connector,
+  NonClientFrameController(shell::Connector* connector,
                            mus::Window* window,
                            mus::WindowManagerClient* window_manager_client);
   ~NonClientFrameController() override;
 
   // views::WidgetDelegateView:
   base::string16 GetWindowTitle() const override;
   views::View* GetContentsView() override;
   bool CanResize() const override;
   bool CanMaximize() const override;
   bool CanMinimize() const override;
@@ skipping 14 matching lines @@
   // is null.
   mus::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameController);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_