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

components/mus/ws/display_manager.h

 // Copyright 2014 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 COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 15 matching lines @@
 class CompositorFrame;
 class SurfaceIdAllocator;
 class SurfaceManager;
 }  // namespace cc
 
 namespace gles2 {
 class GpuState;
 }  // namespace gles2
 
 namespace mojo {
-class ApplicationImpl;
+class Shell;
 }  // namespace mojo
 
 namespace ui {
 class CursorLoader;
 class PlatformWindow;
 struct TextInputState;
 }  // namespace ui
 
 namespace mus {
 
 class GpuState;
 class SurfacesState;
 class TopLevelDisplayClient;
 
 namespace ws {
 
 class DisplayManagerFactory;
 class EventDispatcher;
 class ServerWindow;
 
 // DisplayManager is used to connect the root ServerWindow to a display.
 // TODO(sky): rename this given we have a mojom type with the same name now.
 class DisplayManager {
  public:
   virtual ~DisplayManager() {}
 
   static DisplayManager* Create(
-      mojo::ApplicationImpl* app_impl,
+      mojo::Shell* shell,
       const scoped_refptr<GpuState>& gpu_state,
       const scoped_refptr<SurfacesState>& surfaces_state);
 
   virtual void Init(DisplayManagerDelegate* delegate) = 0;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   virtual void SchedulePaint(const ServerWindow* window,
                              const gfx::Rect& bounds) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
@@ skipping 21 matching lines @@
  private:
   // Static factory instance (always NULL for non-test).
   static DisplayManagerFactory* factory_;
 };
 
 // DisplayManager implementation that connects to the services necessary to
 // actually display.
 class DefaultDisplayManager : public DisplayManager,
                               public ui::PlatformWindowDelegate {
  public:
-  DefaultDisplayManager(mojo::ApplicationImpl* app_impl,
+  DefaultDisplayManager(mojo::Shell* shell,
                         const scoped_refptr<GpuState>& gpu_state,
                         const scoped_refptr<SurfacesState>& surfaces_state);
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
   void Init(DisplayManagerDelegate* delegate) override;
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
@@ skipping 25 matching lines @@
   void DispatchEvent(ui::Event* event) override;
   void OnCloseRequest() override;
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_pixel_ratio) override;
   void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
-  mojo::ApplicationImpl* app_impl_;
+  mojo::Shell* shell_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
   DisplayManagerDelegate* delegate_;
 
   mojom::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_;
 
   scoped_ptr<TopLevelDisplayClient> top_level_display_client_;
   scoped_ptr<ui::PlatformWindow> platform_window_;
 
 #if !defined(OS_ANDROID)
   scoped_ptr<ui::CursorLoader> cursor_loader_;
 #endif
 
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_