Merge 241955 "Make extensions icons easier to target with gestures"

ui/views/rect_based_targeting_utils.cc

Index: ui/views/rect_based_targeting_utils.cc
===================================================================
--- ui/views/rect_based_targeting_utils.cc	(revision 242152)
+++ ui/views/rect_based_targeting_utils.cc	(working copy)
@@ -9,21 +9,6 @@
 
 namespace views {
 
-namespace {
-
-// The positive distance from |pos| to the nearest endpoint of the interval
-// [start, end] is returned if |pos| lies within the interval, otherwise
-// 0 is returned.
-int DistanceToInterval(int pos, int start, int end) {
-  if (pos < start)
-    return start - pos;
-  if (pos > end)
-    return pos - end;
-  return 0;
-}
-
-}  // namespace
-
 bool UsePointBasedTargeting(const gfx::Rect& rect) {
   return rect.width() == 1 && rect.height() == 1;
 }
@@ -37,21 +22,11 @@
       static_cast<float>(intersect_area) / static_cast<float>(rect_1_area) : 0;
 }
 
-int DistanceSquaredFromCenterLineToPoint(const gfx::Point& point,
-                                         const gfx::Rect& rect) {
+int DistanceSquaredFromCenterToPoint(const gfx::Point& point,
+                                     const gfx::Rect& rect) {
   gfx::Point center_point = rect.CenterPoint();
   int dx = center_point.x() - point.x();
   int dy = center_point.y() - point.y();
-
-  if (rect.width() > rect.height()) {
-    dx = DistanceToInterval(point.x(),
-                            rect.x() + (rect.height() / 2),
-                            rect.right() - (rect.height() / 2));
-  } else {
-    dy = DistanceToInterval(point.y(),
-                            rect.y() + (rect.width() / 2),
-                            rect.bottom() - (rect.width() / 2));
-  }
   return (dx * dx) + (dy * dy);
 }