diff options
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r-- | chrome/browser/automation/automation_provider.cc | 8 | ||||
-rw-r--r-- | chrome/browser/automation/ui_controls.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 1456adc..c7bb3d5 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1148,13 +1148,13 @@ void AutomationProvider::WindowGetViewBounds(const IPC::Message& message, ChromeViews::View* view = root_view->GetViewByID(view_id); if (view) { succeeded = true; - CPoint point(0, 0); + gfx::Point point; if (screen_coordinates) ChromeViews::View::ConvertPointToScreen(view, &point); else ChromeViews::View::ConvertPointToView(view, root_view, &point); view->GetLocalBounds(&bounds, false); - bounds.MoveToXY(point.x, point.y); + bounds.MoveToXY(point.x(), point.y()); } } } @@ -1182,9 +1182,9 @@ class MouseEventTask : public Task { // the drag code moved away from using mouse event locations was because // our conversion to screen location doesn't work well with multiple // monitors, so this only works reliably in a single monitor setup. - CPoint screen_location = CPoint(point_.x, point_.y); + gfx::Point screen_location(point_.x, point_.y); view_->ConvertPointToScreen(view_, &screen_location); - ::SetCursorPos(screen_location.x, screen_location.y); + ::SetCursorPos(screen_location.x(), screen_location.y()); switch (type_) { case ChromeViews::Event::ET_MOUSE_PRESSED: view_->OnMousePressed(event); diff --git a/chrome/browser/automation/ui_controls.cc b/chrome/browser/automation/ui_controls.cc index 9fe42201..ab5f572 100644 --- a/chrome/browser/automation/ui_controls.cc +++ b/chrome/browser/automation/ui_controls.cc @@ -336,9 +336,9 @@ void MoveMouseToCenterAndPress( ChromeViews::View* view, MouseButton button, int state, Task* task) { DCHECK(view); DCHECK(view->GetViewContainer()); - CPoint view_center(view->width() / 2, view->height() / 2); + gfx::Point view_center(view->width() / 2, view->height() / 2); ChromeViews::View::ConvertPointToScreen(view, &view_center); - SendMouseMove(view_center.x, view_center.y); + SendMouseMove(view_center.x(), view_center.y()); SendMouseEventsNotifyWhenDone(button, state, task); } |