Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: ui/base/test/ui_controls_mac.mm

Issue 1777653002: Prepare ui/ module for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More compile errors. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/layout_mac.mm ('k') | ui/events/cocoa/events_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/test/ui_controls_mac.mm
diff --git a/ui/base/test/ui_controls_mac.mm b/ui/base/test/ui_controls_mac.mm
index 15cdb7963b019d11df0e749c13239fb6a40faafe..cd4103d6db1a6827219d1297e875ece574c27608 100644
--- a/ui/base/test/ui_controls_mac.mm
+++ b/ui/base/test/ui_controls_mac.mm
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/message_loop/message_loop.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
#include "ui/events/keycodes/keyboard_code_conversion_mac.h"
#import "ui/events/test/cocoa_test_event_utils.h"
@@ -242,7 +243,7 @@ bool SendMouseMoveNotifyWhenDone(long x, long y, const base::Closure& task) {
NSPoint pointInWindow = g_mouse_location;
if (window)
- pointInWindow = [window convertScreenToBase:pointInWindow];
+ pointInWindow = ui::ConvertPointFromScreenToWindow(window, pointInWindow);
NSTimeInterval timestamp = TimeIntervalSinceSystemStartup();
NSEvent* event =
@@ -304,7 +305,7 @@ bool SendMouseEventsNotifyWhenDone(MouseButton type, int state,
NSWindow* window = WindowAtCurrentMouseLocation();
NSPoint pointInWindow = g_mouse_location;
if (window)
- pointInWindow = [window convertScreenToBase:pointInWindow];
+ pointInWindow = ui::ConvertPointFromScreenToWindow(window, pointInWindow);
NSEvent* event =
[NSEvent mouseEventWithType:etype
« no previous file with comments | « ui/base/layout_mac.mm ('k') | ui/events/cocoa/events_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698