| 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 923591652fe8281a6864164e3913db2dc11fbdd1..889da3e618d88b2421723e0a4fa63e9b33d51310 100644
|
| --- a/ui/views/cocoa/bridged_content_view.mm
|
| +++ b/ui/views/cocoa/bridged_content_view.mm
|
| @@ -82,13 +82,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;
|
|
|