summaryrefslogtreecommitdiffstats
path: root/chrome/views/accessibility/view_accessibility.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 20:58:44 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 20:58:44 +0000
commit96b667d273c25e55150785848942c51f1a98851b (patch)
tree21ad2f8bc3a2148a517998f4ebb0157b22a75082 /chrome/views/accessibility/view_accessibility.cc
parentdf40752a0913948b49086fee421b0d019f7de8da (diff)
downloadchromium_src-96b667d273c25e55150785848942c51f1a98851b.zip
chromium_src-96b667d273c25e55150785848942c51f1a98851b.tar.gz
chromium_src-96b667d273c25e55150785848942c51f1a98851b.tar.bz2
Change all ConvertPointTo* methods to use gfx::Point instead of CPoint.
http://crbug.com/2186 Review URL: http://codereview.chromium.org/7317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/accessibility/view_accessibility.cc')
-rw-r--r--chrome/views/accessibility/view_accessibility.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/views/accessibility/view_accessibility.cc b/chrome/views/accessibility/view_accessibility.cc
index 259eb5c..6122757 100644
--- a/chrome/views/accessibility/view_accessibility.cc
+++ b/chrome/views/accessibility/view_accessibility.cc
@@ -474,10 +474,10 @@ STDMETHODIMP ViewAccessibility::accLocation(LONG* x_left, LONG* y_top,
*width = view_bounds.width();
*height = view_bounds.height();
- CPoint topleft = view_bounds.origin().ToPOINT();
+ gfx::Point topleft(view_bounds.origin());
ChromeViews::View::ConvertPointToScreen(parent, &topleft);
- *x_left = topleft.x;
- *y_top = topleft.y;
+ *x_left = topleft.x();
+ *y_top = topleft.y();
} else {
return E_FAIL;
}
@@ -492,10 +492,10 @@ STDMETHODIMP ViewAccessibility::accHitTest(LONG x_left, LONG y_top,
return E_INVALIDARG;
}
- CPoint pt(x_left, y_top);
+ gfx::Point pt(x_left, y_top);
ChromeViews::View::ConvertPointToView(NULL, view_, &pt);
- if (!view_->HitTest(pt)) {
+ if (!view_->HitTest(pt.ToPOINT())) {
// If containing parent is not hit, return with failure.
child->vt = VT_EMPTY;
return S_FALSE;
@@ -508,7 +508,7 @@ STDMETHODIMP ViewAccessibility::accHitTest(LONG x_left, LONG y_top,
// Search for hit within any of the children.
child_view = view_->GetChildViewAt(child_id);
ChromeViews::View::ConvertPointToView(view_, child_view, &pt);
- if (child_view->HitTest(pt)) {
+ if (child_view->HitTest(pt.ToPOINT())) {
// Store child_id (adjusted with +1 to convert to MSAA indexing).
child->lVal = child_id + 1;
child_hit = true;