mash: Convert ShelfView to wm common types, clean up Shelf access

ash/common/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_
+#ifndef ASH_COMMON_SHELF_SHELF_VIEW_H_
+#define ASH_COMMON_SHELF_SHELF_VIEW_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
@@ skipping 18 matching lines @@
 class MenuModelAdapter;
 class MenuRunner;
 }
 
 namespace ash {
 class AppListButton;
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ScopedRootWindowForNewWindows;
-class Shelf;
 class ShelfButton;
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfModel;
 struct ShelfItem;
+class ShelfWidget;
 class WmShelf;
 
 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 InkDropButtonListener,
                              public views::ContextMenuController,
                              public views::FocusTraversable,
                              public views::BoundsAnimatorObserver,
                              public app_list::ApplicationDragAndDropHost {
  public:
   ShelfView(ShelfModel* model,
             ShelfDelegate* delegate,
             WmShelf* wm_shelf,
-            Shelf* shelf);
+            ShelfWidget* shelf_widget);
   ~ShelfView() override;
 
-  Shelf* shelf() const { return shelf_; }
   WmShelf* wm_shelf() const { return wm_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
@@ skipping 258 matching lines @@
 
   // The model; owned by Launcher.
   ShelfModel* model_;
 
   // Delegate; owned by Launcher.
   ShelfDelegate* delegate_;
 
   // The shelf controller; owned by RootWindowController.
   WmShelf* wm_shelf_;
 
-  // The shelf; owned by ShelfWidget.
-  Shelf* shelf_;
+  // The shelf widget for this view. For overflow bubbles, this is the widget
+  // for the shelf, not for the bubble.
+  ShelfWidget* shelf_widget_;
 
   // Used to manage the set of active launcher buttons. There is a view per
   // item in |model_|.
   std::unique_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).
@@ skipping 100 matching lines @@
   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_
+#endif  // ASH_COMMON_SHELF_SHELF_VIEW_H_