Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mash/wm/non_client_frame_controller.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/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
@@ skipping 72 matching lines @@
   aura::Window* window_;
   const ShadowStyle style_;
   Shadow* shadow_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentWindowLayoutManager);
 };
 
 class WmNativeWidgetMus : public views::NativeWidgetMus {
  public:
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
-                    mojo::shell::mojom::Shell* shell,
+                    mojo::Shell* shell,
                     mus::Window* window)
-      : NativeWidgetMus(delegate,
-                        shell,
-                        window,
+      : NativeWidgetMus(delegate, shell, window,
                         mus::mojom::SurfaceType::UNDERLAY) {}
   ~WmNativeWidgetMus() override {
   }
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
     views::Widget* widget =
         static_cast<views::internal::NativeWidgetPrivate*>(this)->GetWidget();
     NonClientFrameViewMash* frame_view =
         new NonClientFrameViewMash(widget, window());
@@ skipping 53 matching lines @@
 
  private:
   NonClientFrameController* frame_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientViewMus);
 };
 
 }  // namespace
 
 NonClientFrameController::NonClientFrameController(
-    mojo::shell::mojom::Shell* shell,
+    mojo::Shell* shell,
     mus::Window* window,
     mus::WindowManagerClient* window_manager_client)
     : widget_(new views::Widget), window_(window) {
   window_->AddObserver(this);
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   // We initiate focus at the mus level, not at the views level.
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.delegate = this;
   params.native_widget = new WmNativeWidgetMus(widget_, shell, window);
@@ skipping 70 matching lines @@
     widget_->UpdateWindowTitle();
 }
 
 void NonClientFrameController::OnWindowDestroyed(mus::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace wm
 }  // namespace mash