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

mandoline/ui/phone_ui/phone_browser_application_delegate.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 "mandoline/ui/phone_ui/phone_browser_application_delegate.h"
 
 #include "base/command_line.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 "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.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 "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 namespace mandoline {
 
 ////////////////////////////////////////////////////////////////////////////////
 // PhoneBrowserApplicationDelegate, public:
 
 PhoneBrowserApplicationDelegate::PhoneBrowserApplicationDelegate()
-    : app_(nullptr),
+    : shell_(nullptr),
       root_(nullptr),
       content_(nullptr),
       web_view_(this),
       default_url_("http://www.google.com/") {
 }
 
 PhoneBrowserApplicationDelegate::~PhoneBrowserApplicationDelegate() {
   if (root_)
     root_->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PhoneBrowserApplicationDelegate, mojo::ApplicationDelegate implementation:
 
-void PhoneBrowserApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
-  app_ = app;
+void PhoneBrowserApplicationDelegate::Initialize(mojo::Shell* shell,
+                                                 const std::string& url,
+                                                 uint32_t id) {
+  shell_ = shell;
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   for (const auto& arg : command_line->GetArgs()) {
     GURL url(arg);
     if (url.is_valid()) {
       default_url_ = url.spec();
       break;
     }
   }
-  mus::CreateWindowTreeHost(app_, this, &host_, nullptr, nullptr);
+  mus::CreateWindowTreeHost(shell_, this, &host_, nullptr, nullptr);
 }
 
 bool PhoneBrowserApplicationDelegate::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<LaunchHandler>(this);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PhoneBrowserApplicationDelegate, LaunchHandler implementation:
@@ skipping 10 matching lines @@
 void PhoneBrowserApplicationDelegate::OnEmbed(mus::Window* root) {
   CHECK(!root_);
   root_ = root;
   content_ = root->connection()->NewWindow();
   root->AddChild(content_);
   content_->SetBounds(root->bounds());
   content_->SetVisible(true);
   root->AddObserver(this);
 
   host_->SetSize(mojo::Size::From(gfx::Size(320, 640)));
-  web_view_.Init(app_, content_);
+  web_view_.Init(shell_, content_);
   LaunchURL(default_url_);
 }
 
 void PhoneBrowserApplicationDelegate::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // PhoneBrowserApplicationDelegate, mus::WindowObserver implementation:
 
 void PhoneBrowserApplicationDelegate::OnWindowBoundsChanged(
@@ skipping 32 matching lines @@
 // PhoneBrowserApplicationDelegate,
 //       mojo::InterfaceFactory<LaunchHandler> implementation:
 
 void PhoneBrowserApplicationDelegate::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<LaunchHandler> request) {
   launch_handler_bindings_.AddBinding(this, request.Pass());
 }
 
 }  // namespace mandoline