[rough WIP] Make View::GetEventHandlerForRect() non-virtual

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 227 matching lines @@
   explicit TabCloseButton(Tab* tab)
       : views::ImageButton(tab),
         tab_(tab) {
     SetEventTargeter(
         scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
   }
 
   virtual ~TabCloseButton() {}
 
   // views::View:
-  virtual View* GetEventHandlerForRect(const gfx::Rect& rect) OVERRIDE {
-    if (!views::UsePointBasedTargeting(rect))
-      return View::GetEventHandlerForRect(rect);
-
-    // Ignore the padding set on the button.
-    gfx::Rect contents_bounds = GetContentsBounds();
-    contents_bounds.set_x(GetMirroredXForRect(contents_bounds));
-
-    // Include the padding in hit-test for touch events.
-    if (aura::Env::GetInstance()->is_touch_down())
-      contents_bounds = GetLocalBounds();
-
-    return contents_bounds.Intersects(rect) ? this : parent();
-  }
-
   virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) OVERRIDE {
     // Tab close button has no children, so tooltip handler should be the same
     // as the event handler.
     // In addition, a hit test has to be performed for the point (as
     // GetTooltipHandlerForPoint() is responsible for it).
     if (!HitTestPoint(point))
       return NULL;
     return GetEventHandlerForPoint(point);
   }
 
@@ skipping 50 matching lines @@
     int top_overflow = tab_bounds.y() - button_bounds.y();
     int bottom_overflow = button_bounds.bottom() - tab_bounds.bottom();
     if (top_overflow > 0)
       button_bounds.set_y(tab_bounds.y());
     else if (bottom_overflow > 0)
       button_bounds.set_height(button_bounds.height() - bottom_overflow);
 
     return button_bounds;
   }
 
+  // views::ViewTargeterDelegate:
+  virtual View* TargetForRect(View* root,
+                              const gfx::Rect& rect) OVERRIDE {
+    CHECK_EQ(root, this);
+
+    if (!views::UsePointBasedTargeting(rect))
+      return ViewTargeterDelegate::TargetForRect(root, rect);
+
+    // Ignore the padding set on the button.
+    gfx::Rect contents_bounds = GetContentsBounds();
+    contents_bounds.set_x(GetMirroredXForRect(contents_bounds));
+
+    // Include the padding in hit-test for touch events.
+    if (aura::Env::GetInstance()->is_touch_down())
+      contents_bounds = GetLocalBounds();
+
+    return contents_bounds.Intersects(rect) ? this : parent();
+  }
+
   // views:MaskedTargeterDelegate:
   virtual bool GetHitTestMask(gfx::Path* mask) const OVERRIDE {
     DCHECK(mask);
     mask->reset();
 
     // The parent tab may be partially occluded by another tab if we are
     // in stacked tab mode, which means that the tab close button may also
     // be partially occluded. Define the hit test mask of the tab close
     // button to be the intersection of the parent tab's visible bounds
     // and the bounds of the tab close button.
@@ skipping 1315 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }