| Index: ash/shelf/shelf_button.cc
|
| diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc
|
| index 0f5d112c0e32b15f1d9895984aa45c1f98d86ce3..41f0f3df6b7af7be295425cff02ad2c101e7891c 100644
|
| --- a/ash/shelf/shelf_button.cc
|
| +++ b/ash/shelf/shelf_button.cc
|
| @@ -345,8 +345,8 @@ gfx::Rect ShelfButton::GetIconBounds() const {
|
| return icon_view_->bounds();
|
| }
|
|
|
| -void ShelfButton::OnDragStarted() {
|
| - AnimateInkDrop(views::InkDropState::HIDDEN);
|
| +void ShelfButton::OnDragStarted(const ui::LocatedEvent* event) {
|
| + AnimateInkDrop(views::InkDropState::HIDDEN, event);
|
| }
|
|
|
| void ShelfButton::ShowContextMenu(const gfx::Point& p,
|
| @@ -503,7 +503,8 @@ std::unique_ptr<views::InkDropRipple> ShelfButton::CreateInkDropRipple() const {
|
| gfx::Size(kInkDropLargeSize, kInkDropLargeSize),
|
| kInkDropLargeCornerRadius,
|
| gfx::Size(kInkDropSmallSize, kInkDropSmallSize),
|
| - kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
|
| + kInkDropSmallCornerRadius, GetLocalBounds().CenterPoint(),
|
| + GetInkDropBaseColor()));
|
| }
|
|
|
| bool ShelfButton::ShouldEnterPushedState(const ui::Event& event) {
|
|
|