Remove overrides of HitTestRect() which just return false

ash/shelf/shelf_button.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_button.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 106 matching lines @@
       : host_(host),
         show_attention_(false) {
   }
 
   virtual ~BarView() {
     if (show_attention_)
       ShelfButtonAnimation::GetInstance()->RemoveObserver(this);
   }
 
   // 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();
       canvas->SaveLayerAlpha(alpha);
       views::ImageView::OnPaint(canvas);
       canvas->Restore();
     } else {
       views::ImageView::OnPaint(canvas);
     }
   }
 
+  // ui::EventTarget:
+  virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE {
+    return false;
+  }
+
   // ShelfButtonAnimation::Observer
   virtual void AnimationProgressed() OVERRIDE {
     UpdateBounds();
     SchedulePaint();
   }
 
   void SetBarBoundsRect(const gfx::Rect& bounds) {
     base_bounds_ = bounds;
     UpdateBounds();
   }
@@ skipping 41 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfButton::IconView
 
 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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfButton
 
 ShelfButton* ShelfButton::Create(views::ButtonListener* listener,
                                  ShelfButtonHost* host,
                                  ShelfLayoutManager* shelf_layout_manager) {
   ShelfButton* button = new ShelfButton(listener, host, shelf_layout_manager);
@@ skipping 323 matching lines @@
             views::ImageView::CENTER,
             views::ImageView::CENTER,
             views::ImageView::LEADING));
     bar_->SchedulePaint();
   }
 
   bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);
 }
 
 }  // namespace ash