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

chrome/browser/views/tabs/dragged_tab_controller.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 <math.h>
 
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/frame_util.h"
@@ skipping 53 matching lines @@
 
   POINT screen_point_;
   HWND ignore1_;
   HWND result_;
 
   DISALLOW_EVIL_CONSTRUCTORS(WindowFinder);
 };
 
 gfx::Point ConvertScreenPointToTabStripPoint(TabStrip* tabstrip,
                                              const gfx::Point& screen_point) {
-  CPoint tabstrip_topleft(0, 0);
+  gfx::Point tabstrip_topleft;
   ChromeViews::View::ConvertPointToScreen(tabstrip, &tabstrip_topleft);
-  return gfx::Point(screen_point.x() - tabstrip_topleft.x,
-                    screen_point.y() - tabstrip_topleft.y);
+  return gfx::Point(screen_point.x() - tabstrip_topleft.x(),
+                    screen_point.y() - tabstrip_topleft.y());
 }
 
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DraggedTabController, public:
 
 DraggedTabController::DraggedTabController(Tab* source_tab,
                                            TabStrip* source_tabstrip)
     : dragged_contents_(NULL),
@@ skipping 176 matching lines @@
   // single view or window reliably receives events throughout all the various
   // kinds of tab dragging.
   if (msg.message == WM_KEYDOWN && msg.wParam == VK_ESCAPE)
     EndDrag(true);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DraggedTabController, private:
 
 void DraggedTabController::InitWindowCreatePoint() {
-  CPoint mouse_offset_cpoint(mouse_offset_.x(), mouse_offset_.y());
+  window_create_point_.SetPoint(mouse_offset_.x(), mouse_offset_.y());
   Tab* first_tab = attached_tabstrip_->GetTabAt(0);
   ChromeViews::View::ConvertPointToViewContainer(first_tab,
-                                                 &mouse_offset_cpoint);
-  window_create_point_.SetPoint(mouse_offset_cpoint.x, mouse_offset_cpoint.y);
+                                                 &window_create_point_);
 }
 
 gfx::Point DraggedTabController::GetWindowCreatePoint() const {
   POINT pt;
   GetCursorPos(&pt);
   return gfx::Point(pt.x - window_create_point_.x(),
                     pt.y - window_create_point_.y());
 }
 
 void DraggedTabController::ChangeDraggedContents(TabContents* new_contents) {
@@ skipping 431 matching lines @@
 }
 
 gfx::Point DraggedTabController::GetCursorScreenPoint() const {
   POINT pt;
   GetCursorPos(&pt);
   return gfx::Point(pt);
 }
 
 gfx::Rect DraggedTabController::GetViewScreenBounds(
     ChromeViews::View* view) const {
-  CPoint view_topleft(0, 0);
+  gfx::Point view_topleft;
   ChromeViews::View::ConvertPointToScreen(view, &view_topleft);
   CRect view_screen_bounds;
   view->GetLocalBounds(&view_screen_bounds, true);
-  view_screen_bounds.OffsetRect(view_topleft);
+  view_screen_bounds.OffsetRect(view_topleft.ToPOINT());
   return gfx::Rect(view_screen_bounds);
 }
 
 int DraggedTabController::NormalizeIndexToAttachedTabStrip(int index) const {
   DCHECK(attached_tabstrip_) << "Can only be called when attached!";
   TabStripModel* attached_model = attached_tabstrip_->model();
   if (index >= attached_model->count())
     return attached_model->count() - 1;
   if (index == TabStripModel::kNoTab)
     return 0;
@@ skipping 38 matching lines @@
     Tab* tab = GetTabMatchingDraggedContents(attached_tabstrip_);
     if (tab)
       tab->SetVisible(true);
   }
   CleanUpHiddenFrame();
 
   if (!in_destructor_)
     source_tabstrip_->DestroyDragController();
 }