chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm - Issue 6612025: [Mac] Apply CrTrackingArea to the two other places where we get |-mouseMoved:| zombie messages.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

Issue 6612025: [Mac] Apply CrTrackingArea to the two other places where we get |-mouseMoved:| zombie messages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: '' Created 9 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 | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

index 74a8d22c5566ddb693d076d4ff6622b9e3082871..5f4a182d37edfbfb1c5fcb7ae32b99d9903260ff 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

@@ -959,20 +959,20 @@ struct LayoutMetrics {

- (void)addOrUpdateScrollTracking {

[self removeScrollTracking];

NSView* view = [[self window] contentView];

- scrollTrackingArea_.reset([[NSTrackingArea alloc]

+ scrollTrackingArea_.reset([[CrTrackingArea alloc]

initWithRect:[view bounds]

options:(NSTrackingMouseMoved |

NSTrackingMouseEnteredAndExited |

NSTrackingActiveAlways)

- owner:self

+ proxiedOwner:self

userInfo:nil]);

- [view addTrackingArea:scrollTrackingArea_];

+ [view addTrackingArea:scrollTrackingArea_.get()];

}

// Remove the tracking area associated with scrolling.

- (void)removeScrollTracking {

if (scrollTrackingArea_.get()) {

- [[[self window] contentView] removeTrackingArea:scrollTrackingArea_];

+ [[[self window] contentView] removeTrackingArea:scrollTrackingArea_.get()];

}

scrollTrackingArea_.reset();

}