Cleanup ash shelf accessor functions.

ash/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 ASH_SHELF_SHELF_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 16 matching lines @@
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
 class BoundsAnimator;
 class MenuRunner;
 }
 
 namespace ash {
+class Shelf;
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfItemDelegateManager;
 class ShelfModel;
 struct ShelfItem;
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ShelfButton;
-class ShelfLayoutManager;
 class ShelfTooltipManager;
 
 namespace test {
 class ShelfViewTestAPI;
 }
 
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT;
 
 class ASH_EXPORT ShelfView : public views::View,
                              public ShelfModelObserver,
                              public views::ButtonListener,
                              public ShelfButtonHost,
                              public views::ContextMenuController,
                              public views::FocusTraversable,
                              public views::BoundsAnimatorObserver,
                              public app_list::ApplicationDragAndDropHost {
  public:
-  ShelfView(ShelfModel* model,
-            ShelfDelegate* delegate,
-            ShelfLayoutManager* manager);
+  ShelfView(ShelfModel* model, ShelfDelegate* delegate, Shelf* shelf);
   ~ShelfView() override;
 
   ShelfTooltipManager* tooltip_manager() { return tooltip_.get(); }
 
-  ShelfLayoutManager* shelf_layout_manager() { return layout_manager_; }
-
-  ShelfModel* model() { return model_; }
+  Shelf* shelf() const { return shelf_; }
+  ShelfModel* model() const { return model_; }
 
   void Init();
 
   void OnShelfAlignmentChanged();
   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 69 matching lines @@
   };
 
   // Returns true when this ShelfView is used for Overflow Bubble.
   // In this mode, it does not show app list, panel and overflow button.
   // Note:
   //   * When Shelf can contain only one item (overflow button) due to very
   //     small resolution screen, overflow bubble can show app list and panel
   //     button.
   bool is_overflow_mode() const { return overflow_mode_; }
 
-  bool dragging() const {
-    return drag_pointer_ != NONE;
-  }
+  bool dragging() const { return drag_pointer_ != NONE; }
 
   // Sets the bounds of each view to its ideal bounds.
   void LayoutToIdealBounds();
 
   // Update all button's visibility in overflow.
   void UpdateAllButtonsVisibilityInOverflowMode();
 
   // Calculates the ideal bounds. The bounds of each button corresponding to an
   // item in the model is set in |view_model_|.
   void CalculateIdealBounds(IdealBounds* bounds) const;
@@ skipping 143 matching lines @@
   // Get the distance from the given |coordinate| to the closest point on this
   // launcher/shelf.
   int CalculateShelfDistance(const gfx::Point& coordinate) const;
 
   // The model; owned by Launcher.
   ShelfModel* model_;
 
   // Delegate; owned by Launcher.
   ShelfDelegate* delegate_;
 
+  // The shelf; owned by ShelfWidget.
+  Shelf* shelf_;
+
   // Used to manage the set of active launcher buttons. There is a view per
   // item in |model_|.
   scoped_ptr<views::ViewModel> view_model_;
 
   // Index of first visible launcher item.
   int first_visible_index_;
 
   // Last index of a launcher button that is visible
   // (does not go into overflow).
   mutable int last_visible_index_;
@@ skipping 79 matching lines @@
 
   // True when the icon was dragged off the shelf.
   bool dragged_off_shelf_;
 
   // The rip off view when a snap back operation is underway.
   views::View* snap_back_from_rip_off_view_;
 
   // Holds ShelfItemDelegateManager.
   ShelfItemDelegateManager* item_manager_;
 
-  // Holds ShelfLayoutManager.
-  ShelfLayoutManager* layout_manager_;
-
   // True when this ShelfView is used for Overflow Bubble.
   bool overflow_mode_;
 
   // Holds a pointer to main ShelfView when a ShelfView is in overflow mode.
   ShelfView* main_shelf_;
 
   // True when ripped item from overflow bubble is entered into Shelf.
   bool dragged_off_from_overflow_to_shelf_;
 
   // True if the event is a repost event from a event which has just closed the
   // menu of the same shelf item.
   bool is_repost_event_;
 
   // Record the index for the last pressed shelf item. This variable is used to
   // check if a repost event occurs on the same shelf item as previous one. If
   // so, the repost event should be ignored.
   int last_pressed_index_;
 
   // Tracks UMA metrics based on shelf button press actions.
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_