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

Unified Diff: ui/base/cocoa/command_dispatcher.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/cocoa/cocoa_base_utils.mm ('k') | ui/base/layout_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/command_dispatcher.mm
diff --git a/ui/base/cocoa/command_dispatcher.mm b/ui/base/cocoa/command_dispatcher.mm
index 64ac8fd1bb229d5c448b7f73195ead700d89e2cd..46a351b4ce8c09b399011bf36313ac34db9fb6ec 100644
--- a/ui/base/cocoa/command_dispatcher.mm
+++ b/ui/base/cocoa/command_dispatcher.mm
@@ -5,6 +5,7 @@
#import "ui/base/cocoa/command_dispatcher.h"
#include "base/logging.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
namespace {
@@ -15,8 +16,8 @@ NSEvent* KeyEventForWindow(NSWindow* window, NSEvent* event) {
// Convert the event's location from the original window's coordinates into
// our own.
NSPoint location = [event locationInWindow];
- location = [[event window] convertBaseToScreen:location];
- location = [window convertScreenToBase:location];
+ location = ui::ConvertPointFromWindowToScreen([event window], location);
+ location = ui::ConvertPointFromScreenToWindow(window, location);
// Various things *only* apply to key down/up.
bool is_a_repeat = false;
« no previous file with comments | « ui/base/cocoa/cocoa_base_utils.mm ('k') | ui/base/layout_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698