diff options
Diffstat (limited to 'chrome/test/base/ui_test_utils_mac.mm')
| -rw-r--r-- | chrome/test/base/ui_test_utils_mac.mm | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/chrome/test/base/ui_test_utils_mac.mm b/chrome/test/base/ui_test_utils_mac.mm index cecb701..dc6fe23 100644 --- a/chrome/test/base/ui_test_utils_mac.mm +++ b/chrome/test/base/ui_test_utils_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,12 @@ #include <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> +#include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" -#include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" +#include "ui/ui_controls/ui_controls.h" #import "chrome/browser/ui/cocoa/view_id_util.h" namespace ui_test_utils { @@ -43,7 +44,7 @@ void ClickOnView(const Browser* browser, ViewID vid) { DCHECK(window); NSView* view = view_id_util::GetView(window, vid); DCHECK(view); - ui_controls::MoveMouseToCenterAndPress( + MoveMouseToCenterAndPress( view, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, @@ -65,4 +66,28 @@ bool ShowAndFocusNativeWindow(gfx::NativeWindow window) { return true; } +void MoveMouseToCenterAndPress( + NSView* view, + ui_controls::MouseButton button, + int state, + const base::Closure& task) { + DCHECK(view); + NSWindow* window = [view window]; + DCHECK(window); + NSScreen* screen = [window screen]; + DCHECK(screen); + + // Converts the center position of the view into the coordinates accepted + // by SendMouseMoveNotifyWhenDone() method. + NSRect bounds = [view bounds]; + NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds)); + center = [view convertPoint:center toView:nil]; + center = [window convertBaseToScreen:center]; + center = NSMakePoint(center.x, [screen frame].size.height - center.y); + + ui_controls::SendMouseMoveNotifyWhenDone( + center.x, center.y, + base::Bind(&internal::ClickTask, button, state, task)); +} + } // namespace ui_test_utils |