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

Unified Diff: ui/views/cocoa/bridged_content_view.mm

Issue 891003004: MacViews: Implement SetCursor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5
Patch Set: assign -> retain Created 5 years, 10 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 | « no previous file | ui/views/cocoa/bridged_native_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_content_view.mm
diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm
index 8aabac1e8de7b0c320a6c882172715036dc2d133..8582fb6cf7c352b54c0a9f9a077b0c687ef5c944 100644
--- a/ui/views/cocoa/bridged_content_view.mm
+++ b/ui/views/cocoa/bridged_content_view.mm
@@ -79,13 +79,14 @@ gfx::Point MovePointToWindow(const NSPoint& point,
if ((self = [super initWithFrame:initialFrame])) {
hostedView_ = viewToHost;
- trackingArea_.reset(
- [[CrTrackingArea alloc] initWithRect:NSZeroRect
- options:NSTrackingMouseMoved |
- NSTrackingActiveAlways |
- NSTrackingInVisibleRect
- owner:self
- userInfo:nil]);
+ // Apple's documentation says that NSTrackingActiveAlways is incompatible
+ // with NSTrackingCursorUpdate, so use NSTrackingActiveInActiveApp.
+ trackingArea_.reset([[CrTrackingArea alloc]
+ initWithRect:NSZeroRect
+ options:NSTrackingMouseMoved | NSTrackingCursorUpdate |
+ NSTrackingActiveInActiveApp | NSTrackingInVisibleRect
+ owner:self
+ userInfo:nil]);
[self addTrackingArea:trackingArea_.get()];
}
return self;
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_native_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698