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

mandoline/ui/desktop_ui/browser_window.h

 // 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.
 
 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 33 matching lines @@
 class ProgressView;
 class ToolbarView;
 
 class BrowserWindow : public mus::WindowTreeDelegate,
                       public web_view::mojom::WebViewClient,
                       public ViewEmbedder,
                       public mojo::InterfaceFactory<ViewEmbedder>,
                       public FindBarDelegate,
                       public mus::WindowManagerDelegate {
  public:
-  BrowserWindow(mojo::ApplicationImpl* app,
+  BrowserWindow(mojo::Shell* shell,
                 mus::mojom::WindowTreeHostFactory* host_factory,
                 BrowserManager* manager);
 
   void LoadURL(const GURL& url);
   void Close();
 
   void ShowOmnibox();
   void ShowFind();
   void GoBack();
   void GoForward();
@@ skipping 42 matching lines @@
 
   // Overridden from FindBarDelegate:
   void OnDoFind(const std::string& find, bool forward) override;
   void OnHideFindBar() override;
 
   void Init(mus::Window* root);
   void EmbedOmnibox();
 
   void Layout(views::View* host);
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mus::WindowManagerClient* window_manager_client_;
   scoped_ptr<ui::mojo::UIInit> ui_init_;
   scoped_ptr<views::AuraInit> aura_init_;
   mus::mojom::WindowTreeHostPtr host_;
   BrowserManager* manager_;
   ToolbarView* toolbar_view_;
   ProgressView* progress_bar_;
   FindBarView* find_bar_view_;
   mus::Window* root_;
   mus::Window* content_;
@@ skipping 14 matching lines @@
 
   OmniboxPtr omnibox_;
   scoped_ptr<mojo::ApplicationConnection> omnibox_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWindow);
 };
 
 }  // namespace mandoline
 
 #endif  // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_