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

mandoline/ui/desktop_ui/browser_window.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/desktop_ui/browser_window.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/scoped_window_ptr.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "mandoline/ui/desktop_ui/browser_commands.h"
 #include "mandoline/ui/desktop_ui/browser_manager.h"
 #include "mandoline/ui/desktop_ui/find_bar_view.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h"
 #include "mandoline/ui/desktop_ui/toolbar_view.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/tracing/public/cpp/switches.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "ui/gfx/canvas.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.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"
 
@@ skipping 58 matching lines @@
   }
 
   BrowserWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(LayoutManagerImpl);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, public:
 
-BrowserWindow::BrowserWindow(mojo::ApplicationImpl* app,
+BrowserWindow::BrowserWindow(mojo::Shell* shell,
                              mus::mojom::WindowTreeHostFactory* host_factory,
                              BrowserManager* manager)
-    : app_(app),
+    : shell_(shell),
       window_manager_client_(nullptr),
       manager_(manager),
       toolbar_view_(nullptr),
       progress_bar_(nullptr),
       find_bar_view_(nullptr),
       root_(nullptr),
       content_(nullptr),
       omnibox_view_(nullptr),
       find_active_(0),
       find_count_(0),
@@ skipping 22 matching lines @@
 void BrowserWindow::Close() {
   if (root_)
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
   else
     delete this;
 }
 
 void BrowserWindow::ShowOmnibox() {
   TRACE_EVENT0("desktop_ui", "BrowserWindow::ShowOmnibox");
   if (!omnibox_.get()) {
-    omnibox_connection_ = app_->ConnectToApplication("mojo:omnibox");
+    omnibox_connection_ = shell_->ConnectToApplication("mojo:omnibox");
     omnibox_connection_->AddService<ViewEmbedder>(this);
     omnibox_connection_->ConnectToService(&omnibox_);
     omnibox_connection_->SetRemoteServiceProviderConnectionErrorHandler(
       [this]() {
         // This will cause the connection to be re-established the next time
         // we come through this codepath.
         omnibox_.reset();
     });
   }
   omnibox_->ShowForURL(mojo::String::From(current_url_.spec()));
@@ skipping 41 matching lines @@
 
   content_ = root_->connection()->NewWindow();
   Init(root_);
 
   host_->SetSize(mojo::Size::From(gfx::Size(1280, 800)));
 
   root_->AddChild(content_);
   window_manager_client_->AddActivationParent(root_);
   content_->SetVisible(true);
 
-  web_view_.Init(app_, content_);
+  web_view_.Init(shell_, content_);
 
   const base::Callback<void(bool)> add_accelerator_callback =
       base::Bind(&OnAcceleratorAdded);
   DCHECK(window_manager_client_);
   window_manager_client_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::CLOSE),
       mus::CreateKeyMatcher(mus::mojom::KeyboardCode::W,
                             mus::mojom::kEventFlagControlDown),
       add_accelerator_callback);
   window_manager_client_->AddAccelerator(
@@ skipping 28 matching lines @@
   // Record the time spent opening initial tabs, used for performance testing.
   const base::TimeDelta open_tabs_delta =
       base::TimeTicks::Now() - display_ticks;
 
   // Record the browser startup time metrics, used for performance testing.
   static bool recorded_browser_startup_metrics = false;
   if (!recorded_browser_startup_metrics &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           tracing::kEnableStatsCollectionBindings)) {
     tracing::StartupPerformanceDataCollectorPtr collector;
-    app_->ConnectToService("mojo:tracing", &collector);
+    shell_->ConnectToService("mojo:tracing", &collector);
     collector->SetBrowserWindowDisplayTicks(display_ticks.ToInternalValue());
     collector->SetBrowserOpenTabsTimeDelta(open_tabs_delta.ToInternalValue());
     collector->SetBrowserMessageLoopStartTicks(
         manager_->startup_ticks().ToInternalValue());
     recorded_browser_startup_metrics = true;
   }
 }
 
 void BrowserWindow::OnConnectionLost(mus::WindowTreeConnection* connection) {
   root_ = nullptr;
@@ skipping 133 matching lines @@
   web_view_.web_view()->StopFinding();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, private:
 
 void BrowserWindow::Init(mus::Window* root) {
   DCHECK_GT(root->viewport_metrics().device_pixel_ratio, 0);
   if (!aura_init_) {
     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"));
   }
 
   root_ = root;
   omnibox_view_ = root_->connection()->NewWindow();
   root_->AddChild(omnibox_view_);
 
   views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
   widget_delegate->GetContentsView()->set_background(
     views::Background::CreateSolidBackground(0xFFDDDDDD));
   toolbar_view_ = new ToolbarView(this);
   progress_bar_ = new ProgressView;
   widget_delegate->GetContentsView()->AddChildView(toolbar_view_);
   widget_delegate->GetContentsView()->AddChildView(progress_bar_);
   widget_delegate->GetContentsView()->SetLayoutManager(
       new LayoutManagerImpl(this));
 
   find_bar_view_ = new FindBarView(this);
   widget_delegate->GetContentsView()->AddChildView(find_bar_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();
   widget->Init(params);
   widget->Show();
   root_->SetFocus();
 }
 
 void BrowserWindow::EmbedOmnibox() {
   mus::mojom::WindowTreeClientPtr view_tree_client;
   omnibox_->GetWindowTreeClient(GetProxy(&view_tree_client));
@@ skipping 29 matching lines @@
   content_bounds.set_width(DIPSToPixels(progress_bar_bounds.width()));
   content_bounds.set_height(host->bounds().height() - content_bounds.y() -
                             DIPSToPixels(10));
   content_->SetBounds(content_bounds);
 
   // The omnibox view bounds are in physical pixels.
   omnibox_view_->SetBounds(bounds_in_physical_pixels);
 }
 
 }  // namespace mandoline