| Index: ash/common/shelf/shelf_view.h
|
| diff --git a/ash/common/shelf/shelf_view.h b/ash/common/shelf/shelf_view.h
|
| index e5f0deccc63facb1725cd21d852addcf377e3cc0..a8be074bf63d30942bdfaac5beab94f06081db93 100644
|
| --- a/ash/common/shelf/shelf_view.h
|
| +++ b/ash/common/shelf/shelf_view.h
|
| @@ -122,6 +122,11 @@ class ASH_EXPORT ShelfView : public views::View,
|
| // coordinate system.
|
| gfx::Rect GetVisibleItemsBoundsInScreen();
|
|
|
| + // InkDropButtonListener:
|
| + void ButtonPressed(views::Button* sender,
|
| + const ui::Event& event,
|
| + views::InkDrop* ink_drop) override;
|
| +
|
| // Overridden from FocusTraversable:
|
| views::FocusSearch* GetFocusSearch() override;
|
| FocusTraversable* GetFocusTraversableParent() override;
|
| @@ -292,11 +297,6 @@ class ASH_EXPORT ShelfView : public views::View,
|
| void OnSetShelfItemDelegate(ShelfID id,
|
| ShelfItemDelegate* item_delegate) override;
|
|
|
| - // Overridden from InkDropButtonListener:
|
| - void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event,
|
| - views::InkDrop* ink_drop) override;
|
| -
|
| // Show a list of all running items for this shelf |item|; it only shows a
|
| // menu if there are multiple running items. |source| specifies the view
|
| // responsible for showing the menu, and the bubble will point towards it.
|
|
|