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

ui/views/mus/native_widget_mus.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 UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 11 matching lines @@
 
 namespace aura {
 namespace client {
 class DefaultCaptureClient;
 class WindowTreeClient;
 }
 class Window;
 }
 
 namespace mojo {
-namespace shell {
-namespace mojom {
 class Shell;
 }
-}
-}
 
 namespace mus {
 class Window;
 class WindowTreeConnection;
 
 }
 
 namespace wm {
 class FocusController;
 }
 
 namespace views {
 class SurfaceContextFactory;
 class WidgetDelegate;
 class WindowTreeHostMus;
 
 // An implementation of NativeWidget that binds to a mus::Window. Because Aura
 // is used extensively within Views code, this code uses aura and binds to the
 // mus::Window via a Mus-specific aura::WindowTreeHost impl. Because the root
 // aura::Window in a hierarchy is created without a delegate by the
 // aura::WindowTreeHost, we must create a child aura::Window in this class
 // (content_) and attach it to the root.
 class VIEWS_MUS_EXPORT NativeWidgetMus : public internal::NativeWidgetPrivate,
                                          public aura::WindowDelegate,
                                          public aura::WindowTreeHostObserver {
  public:
   NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
-                  mojo::shell::mojom::Shell* shell,
+                  mojo::Shell* shell,
                   mus::Window* window,
                   mus::mojom::SurfaceType surface_type);
   ~NativeWidgetMus() override;
 
   // Configures the set of properties supplied to the window manager when
   // creating a new Window for a Widget.
   static void ConfigurePropertiesForNewWindow(
       const Widget::InitParams& init_params,
       std::map<std::string, std::vector<uint8_t>>* properties);
 
@@ skipping 121 matching lines @@
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from aura::WindowTreeHostObserver:
   void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
 
  private:
   mus::Window* window_;
 
-  mojo::shell::mojom::Shell* shell_;
+  mojo::Shell* shell_;
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
   const mus::mojom::SurfaceType surface_type_;
   ui::PlatformWindowState show_state_before_fullscreen_;
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   // Aura configuration.
   scoped_ptr<SurfaceContextFactory> context_factory_;
   scoped_ptr<WindowTreeHostMus> window_tree_host_;
   aura::Window* content_;
   scoped_ptr<wm::FocusController> focus_client_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
   base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_