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

mash/wm/root_window_controller.cc

 // Copyright 2016 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/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "mash/shell/public/interfaces/shell.mojom.h"
 #include "mash/wm/background_layout.h"
 #include "mash/wm/screenlock_layout.h"
 #include "mash/wm/shadow_controller.h"
 #include "mash/wm/shelf_layout.h"
 #include "mash/wm/window_layout.h"
 #include "mash/wm/window_manager.h"
 #include "mash/wm/window_manager_application.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace mash {
 namespace wm {
 namespace {
 
 const uint32_t kWindowSwitchAccelerator = 1;
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 }  // namespace
 
 // static
 RootWindowController* RootWindowController::CreateUsingWindowTreeHost(
     WindowManagerApplication* app) {
   RootWindowController* controller = new RootWindowController(app);
-  mus::CreateWindowTreeHost(app->app(), controller,
+  mus::CreateWindowTreeHost(app->shell(), controller,
                             &controller->window_tree_host_,
                             controller->window_manager_.get());
   return controller;
 }
 
 // static
 RootWindowController* RootWindowController::CreateFromDisplay(
     WindowManagerApplication* app,
     mus::mojom::DisplayPtr display,
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
   RootWindowController* controller = new RootWindowController(app);
   controller->display_ = std::move(display);
   mus::WindowTreeConnection::CreateForWindowManager(
       controller, std::move(client_request),
       mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED,
       controller->window_manager_.get());
   return controller;
 }
 
 void RootWindowController::Destroy() {
   // See class description for details on lifetime.
   if (root_) {
     delete root_->connection();
   } else {
     // This case only happens if we're destroyed before OnEmbed().
     delete this;
   }
 }
 
-mojo::shell::mojom::Shell* RootWindowController::GetShell() {
-  return app_->app()->shell();
+mojo::Shell* RootWindowController::GetShell() {
+  return app_->shell();
 }
 
 mus::Window* RootWindowController::GetWindowForContainer(
     mojom::Container container) {
   const mus::Id window_id = root_->connection()->GetConnectionId() << 16 |
                             static_cast<uint16_t>(container);
   return root_->GetChildById(window_id);
 }
 
 mus::Window* RootWindowController::GetWindowById(mus::Id id) {
@@ skipping 51 matching lines @@
 
   mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
   window_layout_.reset(
       new WindowLayout(GetWindowForContainer(mojom::Container::USER_WINDOWS)));
   window_manager_client()->AddActivationParent(window);
   window_tree_host_->SetTitle("Mash");
 
   AddAccelerators();
 
   mash::shell::mojom::ShellPtr shell;
-  app_->app()->ConnectToService("mojo:mash_shell", &shell);
+  app_->shell()->ConnectToService("mojo:mash_shell", &shell);
   window_manager_->Initialize(this, std::move(shell));
 
   shadow_controller_.reset(new ShadowController(root->connection()));
 
   app_->OnRootWindowControllerDoneInit(this);
 }
 
 void RootWindowController::OnConnectionLost(
     mus::WindowTreeConnection* connection) {
   shadow_controller_.reset();
@@ skipping 49 matching lines @@
                   mojom::Container::LOGIN_WINDOWS);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash