Replace views::LocatedEvent with ui::LocatedEvent

chrome/browser/ui/views/tabs/tab_drag_controller.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_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 974 matching lines @@
         base::TimeDelta::FromMilliseconds(delay_ms),
         base::Bind(&TabDragController::MoveAttachedToPreviousStackedIndex,
                    base::Unretained(this), point_in_screen));
   }
 }
 
 TabDragController::DetachPosition TabDragController::GetDetachPosition(
     const gfx::Point& point_in_screen) {
   DCHECK(attached_tabstrip_);
   gfx::Point attached_point(point_in_screen);
-  views::View::ConvertPointToView(NULL, attached_tabstrip_, &attached_point);
+  views::View::ConvertPointToTarget(NULL, attached_tabstrip_, &attached_point);
   if (attached_point.x() < 0)
     return DETACH_BEFORE;
   if (attached_point.x() >= attached_tabstrip_->width())
     return DETACH_AFTER;
   return DETACH_ABOVE_OR_BELOW;
 }
 
 DockInfo TabDragController::GetDockInfoAtPoint(
     const gfx::Point& point_in_screen) {
   // TODO: add support for dock info when |detach_into_browser_| is true.
@@ skipping 111 matching lines @@
 
     // Inserting counts as a move. We don't want the tabs to jitter when the
     // user moves the tab immediately after attaching it.
     last_move_screen_loc_ = point_in_screen.x();
 
     // Figure out where to insert the tab based on the bounds of the dragged
     // representation and the ideal bounds of the other Tabs already in the
     // strip. ("ideal bounds" are stable even if the Tabs' actual bounds are
     // changing due to animation).
     gfx::Point tab_strip_point(point_in_screen);
-    views::View::ConvertPointToView(NULL, attached_tabstrip_, &tab_strip_point);
+    views::View::ConvertPointToTarget(NULL, attached_tabstrip_,
+                                      &tab_strip_point);
     tab_strip_point.set_x(
         attached_tabstrip_->GetMirroredXInView(tab_strip_point.x()));
     tab_strip_point.Offset(-mouse_offset_.x(), -mouse_offset_.y());
     gfx::Rect bounds = GetDraggedViewTabStripBounds(tab_strip_point);
     int index = GetInsertionIndexForDraggedBounds(bounds);
     for (size_t i = 0; i < drag_data_.size(); ++i) {
       int add_types = TabStripModel::ADD_NONE;
       if (attached_tabstrip_->touch_layout_.get()) {
         // TouchTabStripLayout positions relative to the active tab, if we don't
         // add the tab as active things bounce around.
@@ skipping 346 matching lines @@
   return gfx::Rect(tab_strip_point.x(), tab_strip_point.y(),
                    static_cast<int>(sel_width),
                    Tab::GetStandardSize().height());
 }
 
 gfx::Point TabDragController::GetAttachedDragPoint(
     const gfx::Point& point_in_screen) {
   DCHECK(attached_tabstrip_);  // The tab must be attached.
 
   gfx::Point tab_loc(point_in_screen);
-  views::View::ConvertPointToView(NULL, attached_tabstrip_, &tab_loc);
+  views::View::ConvertPointToTarget(NULL, attached_tabstrip_, &tab_loc);
   int x =
       attached_tabstrip_->GetMirroredXInView(tab_loc.x()) - mouse_offset_.x();
 
   // TODO: consider caching this.
   std::vector<BaseTab*> attached_tabs;
   for (size_t i = 0; i < drag_data_.size(); ++i)
     attached_tabs.push_back(drag_data_[i].attached_tab);
   int size = attached_tabstrip_->GetSizeNeededForTabs(attached_tabs);
   int max_x = attached_tabstrip_->width() - size;
   return gfx::Point(std::min(std::max(x, 0), max_x), 0);
@@ skipping 452 matching lines @@
     gfx::Point touch_point;
     bool got_touch_point = widget_window->GetRootWindow()->
         gesture_recognizer()->GetLastTouchPointForTarget(widget_window,
                                                          &touch_point);
     DCHECK(got_touch_point);
     return touch_point;
   }
 #endif
   return gfx::Screen::GetCursorScreenPoint();
 }