Replace views::LocatedEvent with ui::LocatedEvent

http://crbug.com/125937
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10828265

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151362 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 12 deletions

diff --git a/ash/launcher/launcher_button_host.h b/ash/launcher/launcher_button_host.h
index 0fbf124..9a48cf6 100644
--- a/ash/launcher/launcher_button_host.h
+++ b/ash/launcher/launcher_button_host.h
@@ -9,8 +9,11 @@
 #include "ash/wm/shelf_types.h"
 #include "base/string16.h"
 
-namespace views {
+namespace ui {
 class LocatedEvent;
+}
+
+namespace views {
 class View;
 }
 
@@ -30,12 +33,12 @@ class ASH_EXPORT LauncherButtonHost {
   // Invoked when a pointer device is pressed on a view.
   virtual void PointerPressedOnButton(views::View* view,
                                       Pointer pointer,
-                                      const views::LocatedEvent& event) = 0;
+                                      const ui::LocatedEvent& event) = 0;
 
   // Invoked when a pointer device is dragged over a view.
   virtual void PointerDraggedOnButton(views::View* view,
                                       Pointer pointer,
-                                      const views::LocatedEvent& event) = 0;
+                                      const ui::LocatedEvent& event) = 0;
 
   // Invoked either if a pointer device is released or mouse capture canceled.
   virtual void PointerReleasedOnButton(views::View* view,
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 29f70d0..20fa176 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -571,7 +571,7 @@ void LauncherView::FadeIn(views::View* view) {
 }
 
 void LauncherView::PrepareForDrag(Pointer pointer,
-                                  const views::LocatedEvent& event) {
+                                  const ui::LocatedEvent& event) {
   DCHECK(!dragging());
   DCHECK(drag_view_);
   drag_pointer_ = pointer;
@@ -589,10 +589,10 @@ void LauncherView::PrepareForDrag(Pointer pointer,
   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);
 
@@ -889,7 +889,7 @@ void LauncherView::LauncherItemMoved(int start_index, int target_index) {
 
 void LauncherView::PointerPressedOnButton(views::View* view,
                                           Pointer pointer,
-                                          const views::LocatedEvent& event) {
+                                          const ui::LocatedEvent& event) {
   if (drag_view_)
     return;
 
@@ -906,7 +906,7 @@ void LauncherView::PointerPressedOnButton(views::View* view,
 
 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_)) >=
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 74e2ff2..bfac558 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -144,10 +144,10 @@ class ASH_EXPORT LauncherView : public views::View,
 
   // Invoked when the pointer has moved enough to trigger a drag. Sets
   // internal state in preparation for the drag.
-  void PrepareForDrag(Pointer pointer, const views::LocatedEvent& event);
+  void PrepareForDrag(Pointer pointer, const ui::LocatedEvent& event);
 
   // Invoked when the mouse is dragged. Updates the models as appropriate.
-  void ContinueDrag(const views::LocatedEvent& event);
+  void ContinueDrag(const ui::LocatedEvent& event);
 
   // Returns true if |typea| and |typeb| should be in the same drag range.
   bool SameDragType(LauncherItemType typea, LauncherItemType typeb) const;
@@ -187,11 +187,11 @@ class ASH_EXPORT LauncherView : public views::View,
   virtual void PointerPressedOnButton(
       views::View* view,
       Pointer pointer,
-      const views::LocatedEvent& event) OVERRIDE;
+      const ui::LocatedEvent& event) OVERRIDE;
   virtual void PointerDraggedOnButton(
       views::View* view,
       Pointer pointer,
-      const views::LocatedEvent& event) OVERRIDE;
+      const ui::LocatedEvent& event) OVERRIDE;
   virtual void PointerReleasedOnButton(views::View* view,
                                        Pointer pointer,
                                        bool canceled) OVERRIDE;