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

chrome/browser/views/old_frames/xp_frame.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/old_frames/xp_frame.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/gfx/native_theme.h"
@@ skipping 1370 matching lines @@
   // Convert from screen to window coordinates
   p.x -= r.left;
   p.y -= r.top;
 
   if (!IsTabStripVisible() &&
       ComputeResizeMode(p.x, p.y, r.Width(), r.Height()) == RM_UNDEFINED &&
       root_view_.GetViewForPoint(p) == frame_view_) {
     return HTCAPTION;
   }
 
-  CPoint tsp(p);
+  gfx::Point tsp(p);
   ChromeViews::View::ConvertPointToView(&root_view_, tabstrip_, &tsp);
 
   // If the mouse is over the tabstrip. Check if we should move the window or
   // capture the mouse.
-  if (tabstrip_->CanProcessInputEvents() && tabstrip_->HitTest(tsp)) {
+  if (tabstrip_->CanProcessInputEvents() && tabstrip_->HitTest(tsp.ToPOINT())) {
     // The top few pixels of a tab strip are a dropshadow - as we're pretty
     // starved of draggable area, let's give it to window dragging (this
     // also makes sense visually.
-    if (!IsZoomed() && tsp.y < kTabShadowSize)
+    if (!IsZoomed() && tsp.y() < kTabShadowSize)
       return HTCAPTION;
 
-    ChromeViews::View* v = tabstrip_->GetViewForPoint(tsp);
+    ChromeViews::View* v = tabstrip_->GetViewForPoint(tsp.ToPOINT());
     // If there is not tab at this location, claim the hit was in the title
     // bar to get a move action.
     if (v == tabstrip_)
       return HTCAPTION;
 
     // If the view under mouse is a tab, check if the tab strip allows tab
     // dragging or not. If not, return caption to get window dragging.
     if (v->GetClassName() == Tab::kTabClassName &&
         !tabstrip_->HasAvailableDragActions())
       return HTCAPTION;
@@ skipping 394 matching lines @@
 bool XPFrame::IsMaximized() {
   return !!IsZoomed();
 }
 
 gfx::Rect XPFrame::GetBoundsForContentBounds(const gfx::Rect content_rect) {
   if (tab_contents_container_->x() == 0 &&
       tab_contents_container_->width() == 0) {
     Layout();
   }
 
-  CPoint p(0, 0);
+  gfx::Point p;
   ChromeViews::View::ConvertPointToViewContainer(tab_contents_container_, &p);
   CRect bounds;
   GetBounds(&bounds, true);
 
   gfx::Rect r;
-  r.set_x(content_rect.x() - p.x);
-  r.set_y(content_rect.y() - p.y);
-  r.set_width(p.x + content_rect.width() +
-              (bounds.Width() - (p.x + tab_contents_container_->width())));
-  r.set_height(p.y + content_rect.height() +
-               (bounds.Height() - (p.y +
+  r.set_x(content_rect.x() - p.x());
+  r.set_y(content_rect.y() - p.y());
+  r.set_width(p.x() + content_rect.width() +
+              (bounds.Width() - (p.x() + tab_contents_container_->width())));
+  r.set_height(p.y() + content_rect.height() +
+               (bounds.Height() - (p.y() +
                                    tab_contents_container_->height())));
   return r;
 }
 
 void XPFrame::InfoBubbleShowing() {
   ignore_ncactivate_ = true;
   paint_as_active_ = true;
 }
 
 void XPFrame::InfoBubbleClosing() {
@@ skipping 665 matching lines @@
 
   // Only do a layout if the current contents is non-null. We assume that if the
   // contents is NULL, we're either being destroyed, or ShowTabContents is going
   // to be invoked with a non-null TabContents again so that there is no need
   // in doing a layout now (and would result in extra work/invalidation on
   // tab switches).
   if (changed && current_tab)
     Layout();
 }