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

mandoline/ui/omnibox/omnibox_application.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/omnibox/omnibox_application.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/url_formatter/url_fixer.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/display_converter.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mandoline {
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl
 
 class OmniboxImpl : public mus::WindowTreeDelegate,
                     public views::LayoutManager,
                     public views::TextfieldController,
                     public Omnibox {
  public:
-  OmniboxImpl(mojo::ApplicationImpl* app,
+  OmniboxImpl(mojo::Shell* shell,
               mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<Omnibox> request);
   ~OmniboxImpl() override;
 
  private:
   // Overridden from mus::WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
   // Overridden from views::LayoutManager:
   gfx::Size GetPreferredSize(const views::View* view) const override;
   void Layout(views::View* host) override;
 
   // Overridden from views::TextfieldController:
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
 
   // Overridden from Omnibox:
   void GetWindowTreeClient(
       mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) override;
   void ShowForURL(const mojo::String& url) override;
 
   void HideWindow();
   void ShowWindow();
 
   scoped_ptr<ui::mojo::UIInit> ui_init_;
   scoped_ptr<views::AuraInit> aura_init_;
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mus::Window* root_;
   mojo::String url_;
   views::Textfield* edit_;
   mojo::Binding<Omnibox> binding_;
   ViewEmbedderPtr view_embedder_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxImpl);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxApplication, public:
 
-OmniboxApplication::OmniboxApplication() : app_(nullptr) {}
+OmniboxApplication::OmniboxApplication() : shell_(nullptr) {}
 OmniboxApplication::~OmniboxApplication() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxApplication, mojo::ApplicationDelegate implementation:
 
-void OmniboxApplication::Initialize(mojo::ApplicationImpl* app) {
-  app_ = app;
-  tracing_.Initialize(app);
+void OmniboxApplication::Initialize(mojo::Shell* shell, const std::string& url,
+                                    uint32_t id) {
+  shell_ = shell;
+  tracing_.Initialize(shell, url);
 }
 
 bool OmniboxApplication::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<Omnibox>(this);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxApplication, mojo::InterfaceFactory<Omnibox> implementation:
 
 void OmniboxApplication::Create(mojo::ApplicationConnection* connection,
                                 mojo::InterfaceRequest<Omnibox> request) {
-  new OmniboxImpl(app_, connection, std::move(request));
+  new OmniboxImpl(shell_, connection, std::move(request));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl, public:
 
-OmniboxImpl::OmniboxImpl(mojo::ApplicationImpl* app,
+OmniboxImpl::OmniboxImpl(mojo::Shell* shell,
                          mojo::ApplicationConnection* connection,
                          mojo::InterfaceRequest<Omnibox> request)
-    : app_(app),
+    : shell_(shell),
       root_(nullptr),
       edit_(nullptr),
       binding_(this, std::move(request)) {
   connection->ConnectToService(&view_embedder_);
 }
 OmniboxImpl::~OmniboxImpl() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl, mus::WindowTreeDelegate implementation:
 
 void OmniboxImpl::OnEmbed(mus::Window* root) {
   root_ = root;
 
   if (!aura_init_.get()) {
     ui_init_.reset(new ui::mojo::UIInit(views::GetDisplaysFromWindow(root_)));
-    aura_init_.reset(new views::AuraInit(app_, "mandoline_ui.pak"));
+    aura_init_.reset(new views::AuraInit(shell_, "mandoline_ui.pak"));
     edit_ = new views::Textfield;
     edit_->set_controller(this);
     edit_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
   }
 
   const int kOpacity = 0xC0;
   views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
   widget_delegate->GetContentsView()->set_background(
       views::Background::CreateSolidBackground(
           SkColorSetA(0xDDDDDD, kOpacity)));
   widget_delegate->GetContentsView()->AddChildView(edit_);
   widget_delegate->GetContentsView()->SetLayoutManager(this);
 
   // TODO(beng): we may be leaking these on subsequent calls to OnEmbed()...
   //             probably should only allow once instance per view.
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.native_widget = new views::NativeWidgetMus(
-      widget, app_->shell(), root, mus::mojom::SurfaceType::DEFAULT);
+      widget, shell_, root, mus::mojom::SurfaceType::DEFAULT);
   params.delegate = widget_delegate;
   params.bounds = root->bounds();
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   widget->Init(params);
   widget->Show();
   widget->GetCompositor()->SetBackgroundColor(
       SkColorSetA(SK_ColorBLACK, kOpacity));
 
   ShowWindow();
 }
@@ skipping 68 matching lines @@
   edit_->SelectAll(false);
   edit_->RequestFocus();
 }
 
 void OmniboxImpl::HideWindow() {
   DCHECK(root_);
   root_->SetVisible(false);
 }
 
 }  // namespace mandoline