Chromium Code Reviews| Index: ash/shelf/shelf_button.cc |
| diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc |
| index fb255d7fd893814150850f8090c2dafe248a56e1..b885c8e8adf413ea4f7d144d88afe45d68dfef3d 100644 |
| --- a/ash/shelf/shelf_button.cc |
| +++ b/ash/shelf/shelf_button.cc |
| @@ -124,11 +124,6 @@ class ShelfButton::BarView : public views::ImageView, |
| } |
| // View |
| - virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE { |
| - // Allow Mouse...() messages to go to the parent view. |
| - return false; |
| - } |
| - |
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
| if (show_attention_) { |
| int alpha = ShelfButtonAnimation::GetInstance()->GetAlpha(); |
| @@ -140,6 +135,11 @@ class ShelfButton::BarView : public views::ImageView, |
| } |
| } |
| + // ui::EventTarget: |
| + virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE { |
| + return false; |
| + } |
| + |
| // ShelfButtonAnimation::Observer |
| virtual void AnimationProgressed() OVERRIDE { |
| UpdateBounds(); |
| @@ -201,8 +201,7 @@ ShelfButton::IconView::IconView() : icon_size_(kIconSize) { |
| ShelfButton::IconView::~IconView() { |
| } |
| -bool ShelfButton::IconView::HitTestRect(const gfx::Rect& rect) const { |
| - // Return false so that ShelfButton gets all the mouse events. |
|
sky
2014/05/21 23:03:58
Please keep these comments, they are helpful.
tdanderson
2014/05/22 19:14:19
Done.
|
| +bool ShelfButton::IconView::CanAcceptEvent(const ui::Event& event) { |
| return false; |
| } |