Change all ConvertPointTo* methods to use gfx::Point instead of CPoint....

chrome/views/root_view.cc

 // Copyright (c) 2006-2008 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/views/root_view.h"
 
 #include <algorithm>
 
 #include "base/base_drag_source.h"
 #include "base/logging.h"
@@ skipping 305 matching lines @@
 
   if (focus_on_mouse_pressed_) {
     HWND hwnd = view_container_->GetHWND();
     if (::GetFocus() != hwnd) {
       ::SetFocus(hwnd);
     }
   }
   return hit_disabled_view;
 }
 
-bool RootView::ConvertPointToMouseHandler(const CPoint &l, CPoint *p) {
+bool RootView::ConvertPointToMouseHandler(const gfx::Point& l,
+                                          gfx::Point* p) {
   //
   // If the mouse_handler was set explicitly, we need to keep
   // sending events even if it was reparented in a different
   // window. (a non explicit mouse handler is automatically
   // cleared when the control is removed from the hierarchy)
   if (explicit_mouse_handler_) {
     if (mouse_pressed_handler_->GetViewContainer()) {
       *p = l;
       ConvertPointToScreen(this, p);
       ConvertPointToView(NULL, mouse_pressed_handler_, p);
@@ skipping 10 matching lines @@
   }
   return true;
 }
 
 bool RootView::OnMouseDragged(const MouseEvent& e) {
   UpdateCursor(e);
 
   if (mouse_pressed_handler_) {
     SetMouseLocationAndFlags(e);
 
-    CPoint p;
-    ConvertPointToMouseHandler(WTL::CPoint(e.x(), e.y()), &p);
-    MouseEvent mouse_event(e.GetType(), p.x, p.y, e.GetFlags());
+    gfx::Point p;
+    ConvertPointToMouseHandler(e.location(), &p);
+    MouseEvent mouse_event(e.GetType(), p.x(), p.y(), e.GetFlags());
     if (!mouse_pressed_handler_->ProcessMouseDragged(mouse_event,
                                                      &drag_info)) {
       mouse_pressed_handler_ = NULL;
       return false;
     } else {
       return true;
     }
   }
   return false;
 }
 
 void RootView::OnMouseReleased(const MouseEvent& e, bool canceled) {
   UpdateCursor(e);
 
   if (mouse_pressed_handler_) {
-    CPoint p;
-    ConvertPointToMouseHandler(WTL::CPoint(e.x(), e.y()), &p);
-    MouseEvent mouse_released(e.GetType(), p.x, p.y, e.GetFlags());
+    gfx::Point p;
+    ConvertPointToMouseHandler(e.location(), &p);
+    MouseEvent mouse_released(e.GetType(), p.x(), p.y(), e.GetFlags());
     // We allow the view to delete us from ProcessMouseReleased. As such,
     // configure state such that we're done first, then call View.
     View* mouse_pressed_handler = mouse_pressed_handler_;
     mouse_pressed_handler_ = NULL;
     explicit_mouse_handler_ = false;
     mouse_pressed_handler->ProcessMouseReleased(mouse_released, canceled);
     // WARNING: we may have been deleted.
   }
 }
 
 void RootView::UpdateCursor(const MouseEvent& e) {
-  View *v = GetViewForPoint(WTL::CPoint(e.x(), e.y()));
+  View *v = GetViewForPoint(e.location().ToPOINT());
 
   if (v && v != this) {
-    CPoint l(e.x(), e.y());
+    gfx::Point l(e.location());
     View::ConvertPointToView(this, v, &l);
-    HCURSOR cursor = v->GetCursorForPoint(e.GetType(), l.x, l.y);
+    HCURSOR cursor = v->GetCursorForPoint(e.GetType(), l.x(), l.y());
     if (cursor) {
       ::SetCursor(cursor);
       return;
     }
   }
   if (previous_cursor_) {
     SetCursor(previous_cursor_);
   }
 }
 
@@ skipping 556 matching lines @@
     drag_view->OnDragDone();
   }
 }
 
 View* RootView::GetDragView() {
   return drag_view_;
 }
 
 }