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

chrome/browser/views/tabs/tab_strip.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/browser/views/tabs/tab_strip.h"
 
 #include "base/gfx/size.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents.h"
@@ skipping 509 matching lines @@
 void TabStrip::ShowApplicationMenu(const gfx::Point& p) {
   TabStripModelDelegate* delegate = model_->delegate();
   if (delegate)
     delegate->ShowApplicationMenu(p);
 }
 
 bool TabStrip::CanProcessInputEvents() const {
   return IsAnimating() == NULL;
 }
 
-bool TabStrip::PointIsWithinWindowCaption(const CPoint& point) {
-  ChromeViews::View* v = GetViewForPoint(point);
+bool TabStrip::PointIsWithinWindowCaption(const gfx::Point& point) {
+  ChromeViews::View* v = GetViewForPoint(point.ToPOINT());
 
   // If there is no control at this location, claim the hit was in the title
   // bar to get a move action.
   if (v == this)
     return true;
 
   // If the point is within the bounds of a Tab, the point can be considered
   // part of the caption if there are no available drag operations for the Tab.
   if (v->GetClassName() == Tab::kTabClassName && !HasAvailableDragActions())
     return true;
 
   // Check to see if the point is within the non-button parts of the new tab
   // button. The button has a non-rectangular shape, so if it's not in the
   // visual portions of the button we treat it as a click to the caption.
-  CPoint point_in_newtab_coords(point);
+  gfx::Point point_in_newtab_coords(point);
   View::ConvertPointToView(this, newtab_button_, &point_in_newtab_coords);
-  if (newtab_button_->bounds().Contains(gfx::Point(point)) &&
-      !newtab_button_->HitTest(point_in_newtab_coords)) {
+  if (newtab_button_->bounds().Contains(point) &&
+      !newtab_button_->HitTest(point_in_newtab_coords.ToPOINT())) {
     return true;
   }
 
   // All other regions, including the new Tab button, should be considered part
   // of the containing Window's client area so that regular events can be
   // processed for them.
   return false;
 }
 
 bool TabStrip::IsCompatibleWith(TabStrip* other) {
@@ skipping 674 matching lines @@
 
   // We only want to run the animation if we're not already at the desired
   // size.
   if (abs(first_tab->width() - w) > 1)
     StartResizeLayoutAnimation();
 }
 
 bool TabStrip::IsCursorInTabStripZone() {
   CRect bounds;
   GetLocalBounds(&bounds, true);
-  CPoint tabstrip_topleft = bounds.TopLeft();
+  gfx::Point tabstrip_topleft(bounds.TopLeft());
   View::ConvertPointToScreen(this, &tabstrip_topleft);
-  bounds.MoveToXY(tabstrip_topleft);
+  bounds.MoveToXY(tabstrip_topleft.ToPOINT());
   bounds.bottom += kTabStripAnimationVSlop;
 
   CPoint cursor_point;
   GetCursorPos(&cursor_point);
 
   return !!bounds.PtInRect(cursor_point);
 }
 
 void TabStrip::AddMessageLoopObserver() {
   if (!added_as_message_loop_observer_) {
@@ skipping 45 matching lines @@
       center_x = tab->x() + (tab->width() / 2);
   } else {
     Tab* last_tab = GetTabAt(drop_index - 1);
     center_x = last_tab->x() + last_tab->width() + (kTabHOffset / 2);
   }
 
   // Mirror the center point if necessary.
   center_x = MirroredXCoordinateInsideView(center_x);
 
   // Determine the screen bounds.
-  CPoint drop_loc(center_x - drop_indicator_width / 2, -drop_indicator_height);
+  gfx::Point drop_loc(center_x - drop_indicator_width / 2,
+                      -drop_indicator_height);
   ConvertPointToScreen(this, &drop_loc);
-  gfx::Rect drop_bounds(drop_loc.x, drop_loc.y, drop_indicator_width,
+  gfx::Rect drop_bounds(drop_loc.x(), drop_loc.y(), drop_indicator_width,
                         drop_indicator_height);
 
   // If the rect doesn't fit on the monitor, push the arrow to the bottom.
   gfx::Rect monitor_bounds = win_util::GetMonitorBoundsForRect(drop_bounds);
   *is_beneath = (monitor_bounds.IsEmpty() ||
                  !monitor_bounds.Contains(drop_bounds));
   if (*is_beneath)
     drop_bounds.Offset(0, drop_bounds.height() + height());
 
   return drop_bounds;
@@ skipping 234 matching lines @@
     }
   }
   return -1;
 }
 
 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const {
   return last_tab->x() + last_tab->width();
 }
 
 bool TabStrip::IsPointInTab(Tab* tab, const CPoint& point_in_tabstrip_coords) {
-  CPoint point_in_tab_coords(point_in_tabstrip_coords);
+  gfx::Point point_in_tab_coords(point_in_tabstrip_coords);
   View::ConvertPointToView(this, tab, &point_in_tab_coords);
-  return tab->HitTest(point_in_tab_coords);
+  return tab->HitTest(point_in_tab_coords.ToPOINT());
 }