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

components/mus/ws/display_manager.cc

 // 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.
 
 #include "components/mus/ws/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
@@ skipping 10 matching lines @@
 #include "components/mus/ws/server_window_surface.h"
 #include "components/mus/ws/server_window_surface_manager.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/converters/transform/transform_type_converters.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/base/cursor/cursor_loader.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/display.h"
 #include "ui/platform_window/platform_ime_controller.h"
 #include "ui/platform_window/platform_window.h"
 
 #if defined(OS_WIN)
 #include "ui/platform_window/win/win_window.h"
@@ skipping 105 matching lines @@
   }
 }
 
 }  // namespace
 
 // static
 DisplayManagerFactory* DisplayManager::factory_ = nullptr;
 
 // static
 DisplayManager* DisplayManager::Create(
-    mojo::ApplicationImpl* app_impl,
+    mojo::Shell* shell,
     const scoped_refptr<GpuState>& gpu_state,
     const scoped_refptr<SurfacesState>& surfaces_state) {
-  if (factory_) {
-    return factory_->CreateDisplayManager(app_impl, gpu_state,
-                                          surfaces_state);
-  }
-  return new DefaultDisplayManager(app_impl, gpu_state,
-                                   surfaces_state);
+  if (factory_)
+    return factory_->CreateDisplayManager(shell, gpu_state, surfaces_state);
+  return new DefaultDisplayManager(shell, gpu_state, surfaces_state);
 }
 
 DefaultDisplayManager::DefaultDisplayManager(
-    mojo::ApplicationImpl* app_impl,
+    mojo::Shell* shell,
     const scoped_refptr<GpuState>& gpu_state,
     const scoped_refptr<SurfacesState>& surfaces_state)
-    : app_impl_(app_impl),
+    : shell_(shell),
       gpu_state_(gpu_state),
       surfaces_state_(surfaces_state),
       delegate_(nullptr),
       draw_timer_(false, false),
       frame_pending_(false),
 #if !defined(OS_ANDROID)
       cursor_loader_(ui::CursorLoader::Create()),
 #endif
       weak_factory_(this) {
   metrics_.size_in_pixels = mojo::Size::New();
@@ skipping 237 matching lines @@
 
 void DefaultDisplayManager::OnAcceleratedWidgetDestroyed() {
   NOTREACHED();
 }
 
 void DefaultDisplayManager::OnActivationChanged(bool active) {}
 
 }  // namespace ws
 
 }  // namespace mus