| Index: ash/common/shelf/shelf_button.cc
|
| diff --git a/ash/common/shelf/shelf_button.cc b/ash/common/shelf/shelf_button.cc
|
| index deb6529aeeb630d41482f7a3edfbf6bff8b8a717..3b4e8a36a81336ffd5bd1df2defa2842973d72b2 100644
|
| --- a/ash/common/shelf/shelf_button.cc
|
| +++ b/ash/common/shelf/shelf_button.cc
|
| @@ -146,7 +146,7 @@ class ShelfButton::BarView : public views::ImageView,
|
| animation_end_time_(base::TimeTicks()),
|
| animating_(false) {
|
| // Make sure the events reach the parent view for handling.
|
| - set_interactive(false);
|
| + set_can_process_events_within_subtree(false);
|
| }
|
|
|
| ~BarView() override {
|
| @@ -276,7 +276,7 @@ ShelfButton::ShelfButton(InkDropButtonListener* listener, ShelfView* shelf_view)
|
| icon_view_->SetHorizontalAlignment(views::ImageView::CENTER);
|
| icon_view_->SetVerticalAlignment(views::ImageView::LEADING);
|
| // Do not make this interactive, so that events are sent to ShelfView.
|
| - icon_view_->set_interactive(false);
|
| + icon_view_->set_can_process_events_within_subtree(false);
|
|
|
| AddChildView(bar_);
|
| AddChildView(icon_view_);
|
|
|