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

chrome/browser/views/old_frames/vista_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/vista_frame.h"
 
 #include <windows.h>
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atltheme.h>
@@ skipping 570 matching lines @@
 bool VistaFrame::IsMaximized() {
   return !!IsZoomed();
 }
 
 gfx::Rect VistaFrame::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 VistaFrame::InfoBubbleShowing() {
   ignore_ncactivate_ = true;
 }
 
 ToolbarStarToggle* VistaFrame::GetStarButton() const {
   return NULL;
@@ skipping 352 matching lines @@
                                         (LPARAM)MAKELONG(pt.x, pt.y),
                                         &l_res);
 
   if (dwm_processed) {
     return l_res;
   }
 
   CRect cr;
   GetBounds(&cr, false);
 
-  CPoint tab_pt(pt);
+  gfx::Point tab_pt(pt);
   ChromeViews::View::ConvertPointToView(NULL, tabstrip_, &tab_pt);
 
   // If we are over the tabstrip
-  if (tab_pt.x > 0 && tab_pt.y >= kTabShadowSize &&
-      tab_pt.x < tabstrip_->width() &&
-      tab_pt.y < tabstrip_->height()) {
-    ChromeViews::View* v = tabstrip_->GetViewForPoint(tab_pt);
+  if (tab_pt.x() > 0 && tab_pt.y() >= kTabShadowSize &&
+      tab_pt.x() < tabstrip_->width() &&
+      tab_pt.y() < tabstrip_->height()) {
+    ChromeViews::View* v = tabstrip_->GetViewForPoint(tab_pt.ToPOINT());
     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;
 
     return HTCLIENT;
@@ skipping 363 matching lines @@
   // 2 is the minimize button.
   UpdatePosition(titlebar_info, 2, &min_x, &max_x, &max_y);
   // 3 is the maximize button.
   UpdatePosition(titlebar_info, 3, &min_x, &max_x, &max_y);
   // 5 is the close button.
   UpdatePosition(titlebar_info, 5, &min_x, &max_x, &max_y);
 
   if (min_x != std::numeric_limits<int>::max() &&
       max_x != std::numeric_limits<int>::min() &&
       max_y != std::numeric_limits<int>::min()) {
-    CPoint screen_drag_point(event.x(), event.y());
+    gfx::Point screen_drag_point(event.x(), event.y());
     ConvertPointToScreen(this, &screen_drag_point);
-    if (screen_drag_point.x >= min_x && screen_drag_point.x <= max_x &&
-        screen_drag_point.y <= max_y) {
+    if (screen_drag_point.x() >= min_x && screen_drag_point.x() <= max_x &&
+        screen_drag_point.y() <= max_y) {
       return false;
     }
   }
   return true;
 }
 
 LRESULT VistaFrame::OnMouseRange(UINT u_msg, WPARAM w_param, LPARAM l_param,
                                  BOOL& handled) {
   // Tooltip handling is broken in Vista when using custom frames, so
   // we have to implement a lot of this ourselves.
@@ skipping 247 matching lines @@
                                       &active_bookmark_bar_);
 
   // 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();
 }