Replace views::LocatedEvent with ui::LocatedEvent

ash/launcher/launcher_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.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 
 #include "ash/launcher/app_list_button.h"
 #include "ash/launcher/launcher_button.h"
@@ skipping 553 matching lines @@
 
 void LauncherView::FadeIn(views::View* view) {
   view->SetVisible(true);
   view->layer()->SetOpacity(0);
   AnimateToIdealBounds();
   bounds_animator_->SetAnimationDelegate(
       view, new FadeInAnimationDelegate(view), true);
 }
 
 void LauncherView::PrepareForDrag(Pointer pointer,
-                                  const views::LocatedEvent& event) {
+                                  const ui::LocatedEvent& event) {
   DCHECK(!dragging());
   DCHECK(drag_view_);
   drag_pointer_ = pointer;
   start_drag_index_ = view_model_->GetIndexOfView(drag_view_);
 
   // If the item is no longer draggable, bail out.
   if (start_drag_index_ == -1 ||
       !delegate_->IsDraggable(model_->items()[start_drag_index_])) {
     CancelDrag(-1);
     return;
   }
 
   // Move the view to the front so that it appears on top of other views.
   ReorderChildView(drag_view_, -1);
   bounds_animator_->StopAnimatingView(drag_view_);
 }
 
-void LauncherView::ContinueDrag(const views::LocatedEvent& event) {
+void LauncherView::ContinueDrag(const ui::LocatedEvent& event) {
   // TODO: I don't think this works correctly with RTL.
   gfx::Point drag_point(event.location());
-  views::View::ConvertPointToView(drag_view_, this, &drag_point);
+  views::View::ConvertPointToTarget(drag_view_, this, &drag_point);
   int current_index = view_model_->GetIndexOfView(drag_view_);
   DCHECK_NE(-1, current_index);
 
   // If the item is no longer draggable, bail out.
   if (current_index == -1 ||
       !delegate_->IsDraggable(model_->items()[current_index])) {
     CancelDrag(-1);
     return;
   }
 
@@ skipping 276 matching lines @@
   }
 }
 
 void LauncherView::LauncherItemMoved(int start_index, int target_index) {
   view_model_->Move(start_index, target_index);
   AnimateToIdealBounds();
 }
 
 void LauncherView::PointerPressedOnButton(views::View* view,
                                           Pointer pointer,
-                                          const views::LocatedEvent& event) {
+                                          const ui::LocatedEvent& event) {
   if (drag_view_)
     return;
 
   tooltip_->Close();
   int index = view_model_->GetIndexOfView(view);
   if (index == -1 ||
       view_model_->view_size() <= 1 ||
       !delegate_->IsDraggable(model_->items()[index]))
     return;  // View is being deleted or not draggable, ignore request.
 
   drag_view_ = view;
   drag_offset_ = primary_axis_coordinate(event.x(), event.y());
 }
 
 void LauncherView::PointerDraggedOnButton(views::View* view,
                                           Pointer pointer,
-                                          const views::LocatedEvent& event) {
+                                          const ui::LocatedEvent& event) {
   if (!dragging() && drag_view_ &&
       primary_axis_coordinate(abs(event.x() - drag_offset_),
                               abs(event.y() - drag_offset_)) >=
       kMinimumDragDistance) {
     PrepareForDrag(pointer, event);
   }
   if (drag_pointer_ == pointer)
     ContinueDrag(event);
 }
 
@@ skipping 156 matching lines @@
   FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
                     OnLauncherIconPositionsChanged());
   PreferredSizeChanged();
 }
 
 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
 }
 
 }  // namespace internal
 }  // namespace ash