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

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 857 matching lines @@
       return cur_view;
 
     gfx::RectF cur_view_bounds_f(cur_view->GetLocalBounds());
     ConvertRectToTarget(cur_view, this, &cur_view_bounds_f);
     gfx::Rect cur_view_bounds = gfx::ToEnclosingRect(
         cur_view_bounds_f);
     if (views::PercentCoveredBy(cur_view_bounds, rect) >= kRectTargetOverlap) {
       // |cur_view| is a suitable candidate for rect-based targeting.
       // Check to see if it is the closest suitable candidate so far.
       gfx::Point touch_center(rect.CenterPoint());
-      int cur_dist = views::DistanceSquaredFromCenterLineToPoint(
-          touch_center, cur_view_bounds);
+      int cur_dist = views::DistanceSquaredFromCenterToPoint(touch_center,
+                                                             cur_view_bounds);
       if (!rect_view || cur_dist < rect_view_distance) {
         rect_view = cur_view;
         rect_view_distance = cur_dist;
       }
     } else if (!rect_view && !point_view) {
       // Rect-based targeting has not yielded any candidates so far. Check
       // if point-based targeting would have selected |cur_view|.
       gfx::Point point_in_child_coords(rect_in_child_coords.CenterPoint());
       if (child->HitTestPoint(point_in_child_coords))
         point_view = child->GetEventHandlerForPoint(point_in_child_coords);
     }
   }
 
   if (views::UsePointBasedTargeting(rect) || (!rect_view && !point_view))
     return this;
 
   // If |this| is a suitable candidate for rect-based targeting, check to
   // see if it is closer than the current best suitable candidate so far.
   gfx::Rect local_bounds(GetLocalBounds());
   if (views::PercentCoveredBy(local_bounds, rect) >= kRectTargetOverlap) {
     gfx::Point touch_center(rect.CenterPoint());
-    int cur_dist = views::DistanceSquaredFromCenterLineToPoint(touch_center,
-                                                               local_bounds);
+    int cur_dist = views::DistanceSquaredFromCenterToPoint(touch_center,
+                                                           local_bounds);
     if (!rect_view || cur_dist < rect_view_distance)
       rect_view = this;
   }
 
   return rect_view ? rect_view : point_view;
 }
 
 View* View::GetTooltipHandlerForPoint(const gfx::Point& point) {
   if (!HitTestPoint(point))
     return NULL;
@@ skipping 1482 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views