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

mash/shelf/shelf_view.h

 // Copyright (c) 2012 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 MASH_SHELF_SHELF_VIEW_H_
 #define MASH_SHELF_SHELF_VIEW_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mash/shelf/shelf_button_host.h"
 #include "mash/shelf/shelf_model.h"
 #include "mash/shelf/shelf_model_observer.h"
 #include "mash/shelf/shelf_tooltip_manager.h"
 #include "mash/shelf/shelf_types.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/view_model.h"
 
 namespace mojo {
-class ApplicationImpl;
+class Shell;
 }
 
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
 class BoundsAnimator;
 class MenuRunner;
 }
@@ skipping 15 matching lines @@
 // TODO(msw): Restore missing features and testing from the ash shelf:
 // Alignment, overflow, applist, drag, background, hiding, pinning, panels, etc.
 class ShelfView : public views::View,
                   public ShelfModelObserver,
                   public views::ButtonListener,
                   public ShelfButtonHost,
                   public views::ContextMenuController,
                   public views::FocusTraversable,
                   public views::BoundsAnimatorObserver {
  public:
-  explicit ShelfView(mojo::ApplicationImpl* app);
+  explicit ShelfView(mojo::Shell* shell);
   ~ShelfView() override;
 
-  mojo::ApplicationImpl* app() const { return app_; }
+  mojo::Shell* shell() const { return shell_; }
 
   void SetAlignment(ShelfAlignment alignment);
 
   void SchedulePaintForAllButtons();
 
   // Returns the ideal bounds of the specified item, or an empty rect if id
   // isn't know. If the item is in an overflow shelf, the overflow icon location
   // will be returned.
   gfx::Rect GetIdealBoundsOfItemIcon(ShelfID id);
 
@@ skipping 228 matching lines @@
   const ShelfItem* ShelfItemForView(const views::View* view) const;
 
   // Returns true if a tooltip should be shown for |view|.
   bool ShouldShowTooltipForView(const views::View* view) const;
 
   // Get the distance from the given |coordinate| to the closest point on this
   // launcher/shelf.
   int CalculateShelfDistance(const gfx::Point& coordinate) const;
 
   // The shelf application instance.
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
 
   // The shelf model.
   ShelfModel model_;
 
   ShelfAlignment alignment_;
 
   // Used to manage the set of active launcher buttons. There is a view per
   // item in |model_|.
   views::ViewModel view_model_;
 
@@ skipping 119 matching lines @@
   // Tracks UMA metrics based on shelf button press actions.
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;*/
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace shelf
 }  // namespace mash
 
 #endif  // MASH_SHELF_SHELF_VIEW_H_