Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: ash/common/shelf/shelf_button.cc

Issue 2713993005: Clean up ImageView. (Closed)
Patch Set: revert errant changes Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
« no previous file with comments | « no previous file | chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698