| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/base/cocoa/cocoa_base_utils.h" | 5 #include "ui/base/cocoa/cocoa_base_utils.h" |
| 6 | 6 |
| 7 #include "ui/events/cocoa/cocoa_event_utils.h" | 7 #include "ui/events/cocoa/cocoa_event_utils.h" |
| 8 | 8 |
| 9 namespace ui { | 9 namespace ui { |
| 10 | 10 |
| 11 WindowOpenDisposition WindowOpenDispositionFromNSEvent(NSEvent* event) { | 11 WindowOpenDisposition WindowOpenDispositionFromNSEvent(NSEvent* event) { |
| 12 NSUInteger modifiers = [event modifierFlags]; | 12 NSUInteger modifiers = [event modifierFlags]; |
| 13 return WindowOpenDispositionFromNSEventWithFlags(event, modifiers); | 13 return WindowOpenDispositionFromNSEventWithFlags(event, modifiers); |
| 14 } | 14 } |
| 15 | 15 |
| 16 WindowOpenDisposition WindowOpenDispositionFromNSEventWithFlags( | 16 WindowOpenDisposition WindowOpenDispositionFromNSEventWithFlags( |
| 17 NSEvent* event, NSUInteger modifiers) { | 17 NSEvent* event, NSUInteger modifiers) { |
| 18 int event_flags = EventFlagsFromNSEventWithModifiers(event, modifiers); | 18 int event_flags = EventFlagsFromNSEventWithModifiers(event, modifiers); |
| 19 return DispositionFromEventFlags(event_flags); | 19 return DispositionFromEventFlags(event_flags); |
| 20 } | 20 } |
| 21 | 21 |
| 22 NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) { |
| 23 NSRect point_rect = NSMakeRect(point.x, point.y, 0, 0); |
| 24 return [window convertRectToScreen:point_rect].origin; |
| 25 } |
| 26 |
| 27 NSPoint ConvertPointFromScreenToWindow(NSWindow* window, NSPoint point) { |
| 28 NSRect point_rect = NSMakeRect(point.x, point.y, 0, 0); |
| 29 return [window convertRectFromScreen:point_rect].origin; |
| 30 } |
| 31 |
| 22 } // namespace ui | 32 } // namespace ui |
| OLD | NEW |