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

chrome/browser/views/status_bubble.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/status_bubble.h"
 
 #include <algorithm>
 
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 549 matching lines @@
 }
 
 void StatusBubble::AvoidMouse() {
   // Our status bubble is located in screen coordinates, so we should get
   // those rather than attempting to reverse decode the web contents
   // coordinates.
   CPoint cursor_location;
   GetCursorPos(&cursor_location);
 
   // Get the position of the frame.
-  CPoint top_left(0, 0);
+  gfx::Point top_left;
   ChromeViews::View::ConvertPointToScreen(frame_->GetRootView(), &top_left);
 
   // Get the cursor position relative to the popup.
-  cursor_location.x -= (top_left.x + position_.x);
-  cursor_location.y -= (top_left.y + position_.y);
+  cursor_location.x -= (top_left.x() + position_.x);
+  cursor_location.y -= (top_left.y() + position_.y);
 
   // If the mouse is in a position where we think it would move the
   // status bubble, figure out where and how the bubble should be moved.
   if (cursor_location.y > -kMousePadding &&
       cursor_location.x < size_.cx + kMousePadding) {
     int offset = kMousePadding + cursor_location.y;
 
     // Make the movement non-linear.
     offset = offset * offset / kMousePadding;
 
@@ skipping 12 matching lines @@
     if (offset >= size_.cy - kShadowSize * 2) {
       offset = size_.cy - kShadowSize * 2;
       view_->SetStyle(StatusView::STYLE_BOTTOM);
     } else if (offset > kBubbleCornerRadius / 2 - kShadowSize) {
       view_->SetStyle(StatusView::STYLE_FLOATING);
     } else {
       view_->SetStyle(StatusView::STYLE_STANDARD);
     }
 
     offset_ = offset;
-    popup_->MoveWindow(top_left.x + position_.x,
-                       top_left.y + position_.y + offset_,
+    popup_->MoveWindow(top_left.x() + position_.x,
+                       top_left.y() + position_.y + offset_,
                        size_.cx,
                        size_.cy);
   } else if (offset_ != 0) {
     offset_ = 0;
     view_->SetStyle(StatusView::STYLE_STANDARD);
-    popup_->MoveWindow(top_left.x + position_.x,
-                       top_left.y + position_.y,
+    popup_->MoveWindow(top_left.x() + position_.x,
+                       top_left.y() + position_.y,
                        size_.cx,
                        size_.cy);
   }
 }
 
 void StatusBubble::Reposition() {
   if (popup_) {
-    CPoint top_left(0, 0);
+    gfx::Point top_left;
     ChromeViews::View::ConvertPointToScreen(frame_->GetRootView(), &top_left);
 
-    popup_->MoveWindow(top_left.x + position_.x,
-                       top_left.y + position_.y,
+    popup_->MoveWindow(top_left.x() + position_.x,
+                       top_left.y() + position_.y,
                        size_.cx,
                        size_.cy);
   }
 }
 
 void StatusBubble::SetBounds(int x, int y, int w, int h) {
   // If the UI layout is RTL, we need to mirror the position of the bubble
   // relative to the parent.
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
     CRect frame_bounds;
     frame_->GetBounds(&frame_bounds, false);
     int mirrored_x = frame_bounds.Width() - x - w;
     position_.SetPoint(mirrored_x, y);
   } else {
     position_.SetPoint(x, y);
   }
 
   size_.SetSize(w, h);
   Reposition();
 }