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

chrome/browser/views/location_bar_view.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/location_bar_view.h"
 
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 558 matching lines @@
     flags |= MK_CONTROL;
   if (event.IsShiftDown())
     flags |= MK_SHIFT;
   if (event.IsLeftMouseButton())
     flags |= MK_LBUTTON;
   if (event.IsMiddleMouseButton())
     flags |= MK_MBUTTON;
   if (event.IsRightMouseButton())
     flags |= MK_RBUTTON;
 
-  CPoint screen_point(event.x(), event.y());
+  gfx::Point screen_point(event.location());
   ConvertPointToScreen(this, &screen_point);
 
-  location_entry_->HandleExternalMsg(msg, flags, screen_point);
+  location_entry_->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
 }
 
 bool LocationBarView::GetAccessibleRole(VARIANT* role) {
   DCHECK(role);
 
   role->vt = VT_I4;
   role->lVal = ROLE_SYSTEM_GROUPING;
   return true;
 }
 
@@ skipping 274 matching lines @@
 
 void LocationBarView::ShowFirstRunBubbleInternal() {
   if (!location_entry_view_)
     return;
   if (!location_entry_view_->GetViewContainer()->IsActive()) {
     // The browser is no longer active.  Let's not show the info bubble, this
     // would make the browser the active window again.
     return;
   }
 
-  CPoint location(0, 0);
+  gfx::Point location;
 
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
   if (UILayoutIsRightToLeft())
-    location.x += width();
+    location.Offset(width(), 0);
   ChromeViews::View::ConvertPointToScreen(this, &location);
 
   // We try to guess that 20 pixels offset is a good place for the first
   // letter in the OmniBox.
-  gfx::Rect bounds(location.x, location.y, 20, height());
+  gfx::Rect bounds(location.x(), location.y(), 20, height());
 
   // Moving the bounds "backwards" so that it appears within the location bar
   // if the UI layout is RTL.
   if (UILayoutIsRightToLeft())
-    bounds.set_x(location.x - 20);
+    bounds.set_x(location.x() - 20);
 
   FirstRunBubble::Show(
       location_entry_view_->GetRootView()->GetViewContainer()->GetHWND(),
       bounds);
 }
 
 void LocationBarView::ShowFirstRunBubble() {
   // We wait 30 milliseconds to open. It allows less flicker.
   Task* task = first_run_bubble_.NewRunnableMethod(
       &LocationBarView::ShowFirstRunBubbleInternal);
@@ skipping 43 matching lines @@
       NOTREACHED();
       break;
   }
 }
 
 void LocationBarView::SecurityImageView::ShowInfoBubble() {
   std::wstring text;
   SkColor text_color;
   model_->GetIconHoverText(&text, &text_color);
 
-  CPoint location(0, 0);
+  gfx::Point location;
   ChromeViews::View::ConvertPointToScreen(this, &location);
-  gfx::Rect bounds(location.x, location.y, width(), height());
+  gfx::Rect bounds(location.x(), location.y(), width(), height());
 
   ChromeViews::Label* label = new ChromeViews::Label(text);
   label->SetMultiLine(true);
   label->SetColor(text_color);
   label->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(2));
   label->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT);
   label->SizeToFit(0);
   DCHECK(info_bubble_ == NULL);
   info_bubble_ = InfoBubble::Show(GetRootView()->GetViewContainer()->GetHWND(),
@@ skipping 48 matching lines @@
 void LocationBarView::SecurityImageView::InfoBubbleClosing(
     InfoBubble* info_bubble) {
   info_bubble_ = NULL;
 }
 
 bool LocationBarView::OverrideAccelerator(
     const ChromeViews::Accelerator& accelerator)  {
   return location_entry_->OverrideAccelerator(accelerator);
 }