mash: Create and show a shelf in mash.

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_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"
 #include "ash/common/shelf/shelf_tooltip_manager.h"
 #include "base/macros.h"
-#include "base/observer_list.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/animation/ink_drop_state.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 ui {
 class MenuModel;
 }
 
 namespace views {
 class BoundsAnimator;
 class MenuModelAdapter;
 class MenuRunner;
 }
 
 namespace ash {
 class AppListButton;
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ScopedRootWindowForNewWindows;
 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;
@@ skipping 24 matching lines @@
   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);
 
   // Repositions the icon for the specified item by the midpoint of the window.
   void UpdatePanelIconPosition(ShelfID id, const gfx::Point& midpoint);
 
-  void AddIconObserver(ShelfIconObserver* observer);
-  void RemoveIconObserver(ShelfIconObserver* observer);
-
   // Returns true if we're showing a menu.
   bool IsShowingMenu() const;
 
   // Returns true if overflow bubble is shown.
   bool IsShowingOverflowBubble() const;
 
   // Sets owner overflow bubble instance from which this shelf view pops
   // out as overflow.
   void set_owner_overflow_bubble(OverflowBubble* owner) {
     owner_overflow_bubble_ = owner;
@@ skipping 290 matching lines @@
 
   std::unique_ptr<views::FocusSearch> focus_search_;
 
   // Manages the context menu, and the list menu.
   std::unique_ptr<ui::MenuModel> menu_model_;
   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
   std::unique_ptr<views::MenuRunner> launcher_menu_runner_;
   std::unique_ptr<ScopedRootWindowForNewWindows>
       scoped_root_window_for_new_windows_;
 
-  base::ObserverList<ShelfIconObserver> observers_;

[James Cook, 2016/08/16 23:21:35]

Yeah, I like getting rid of this. Good call.

[msw, 2016/08/17 01:09:01]

Acknowledged.

-
   // Amount content is inset on the left edge (or top edge for vertical
   // alignment).
   int leading_inset_;
 
   // True when an item being inserted or removed in the model cancels a drag.
   bool cancelling_drag_model_changed_;
 
   // Index of the last hidden launcher item. If there are no hidden items this
   // will be equal to last_visible_index_ + 1.
   mutable int last_hidden_index_;
@@ skipping 51 matching lines @@
 
   // Tracks UMA metrics based on shelf button press actions.
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_VIEW_H_