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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 299633002: Fix BrowserActionButton's hover state in ToolbarController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflit with AUTHORS Created 6 years, 7 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 | « AUTHORS ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index e4a1cf718679f601c0fe7a8d54c25f8dacf4f6b3..27ee8ca7b8b5cc0e3f5fd385dc1a7e12d26ef224 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -361,7 +361,7 @@ class NotificationBridge
}
- (void)mouseExited:(NSEvent*)theEvent {
- [[hoveredButton_ cell] setMouseInside:NO animate:YES];
+ [[hoveredButton_ cell] setIsMouseInside:NO];
[hoveredButton_ release];
hoveredButton_ = nil;
}
@@ -374,7 +374,7 @@ class NotificationBridge
// button cell that cares. GradientButtonCell derived cells care.
if (([targetView isKindOfClass:[NSButton class]]) &&
([[targetView cell]
- respondsToSelector:@selector(setMouseInside:animate:)]))
+ respondsToSelector:@selector(setIsMouseInside:)]))
return targetView;
return nil;
}
@@ -382,8 +382,8 @@ class NotificationBridge
- (void)mouseMoved:(NSEvent*)theEvent {
NSButton* targetView = [self hoverButtonForEvent:theEvent];
if (hoveredButton_ != targetView) {
- [[hoveredButton_ cell] setMouseInside:NO animate:YES];
- [[targetView cell] setMouseInside:YES animate:YES];
+ [[hoveredButton_ cell] setIsMouseInside:NO];
+ [[targetView cell] setIsMouseInside:YES];
[hoveredButton_ release];
hoveredButton_ = [targetView retain];
}
« no previous file with comments | « AUTHORS ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698