| Index: ash/test/shelf_view_test_api.h
|
| diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h
|
| index acb4e40149ff7966174f4331e92a61f28400ff4f..445088bbe2cd1edf53f98517204fe1d47d616bc3 100644
|
| --- a/ash/test/shelf_view_test_api.h
|
| +++ b/ash/test/shelf_view_test_api.h
|
| @@ -20,6 +20,7 @@ class Event;
|
|
|
| namespace views {
|
| class Button;
|
| +class InkDrop;
|
| }
|
|
|
| namespace ash {
|
| @@ -66,6 +67,9 @@ class ShelfViewTestAPI {
|
| // Runs message loop and waits until all add/remove animations are done.
|
| void RunMessageLoopUntilAnimationsDone();
|
|
|
| + // Closes the app list or context menu if it is running.
|
| + void CloseMenu();
|
| +
|
| // An accessor for |shelf_view|.
|
| ShelfView* shelf_view() { return shelf_view_; }
|
|
|
| @@ -84,8 +88,13 @@ class ShelfViewTestAPI {
|
| // Returns the button space size.
|
| int GetButtonSpacing();
|
|
|
| + // Returns minimum distance before drag starts.
|
| + int GetMinimumDragDistance() const;
|
| +
|
| // Wrapper for ShelfView::ButtonPressed.
|
| - void ButtonPressed(views::Button* sender, const ui::Event& event);
|
| + void ButtonPressed(views::Button* sender,
|
| + const ui::Event& event,
|
| + views::InkDrop* ink_drop);
|
|
|
| // Wrapper for ShelfView::SameDragType.
|
| bool SameDragType(ShelfItemType typea, ShelfItemType typeb) const;
|
|
|