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

Unified Diff: chrome/browser/cocoa/extensions/browser_actions_container_view.mm

Issue 1551009: [Mac] Prep for animating the Browser Action Buttons in and out.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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 | « no previous file | chrome/browser/cocoa/extensions/browser_actions_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/extensions/browser_actions_container_view.mm
===================================================================
--- chrome/browser/cocoa/extensions/browser_actions_container_view.mm (revision 43254)
+++ chrome/browser/cocoa/extensions/browser_actions_container_view.mm (working copy)
@@ -165,15 +165,14 @@
lastXPos_ = frame.origin.x;
CGFloat dX = frame.size.width - width;
frame.size.width = width;
- NSRect newFrame = NSOffsetRect(frame, dX, 0);
+ animationEndFrame_ = NSOffsetRect(frame, dX, 0);
if (animate) {
[NSAnimationContext beginGrouping];
[[NSAnimationContext currentContext] setDuration:kAnimationDuration];
- [[self animator] setFrame:newFrame];
+ [[self animator] setFrame:animationEndFrame_];
[NSAnimationContext endGrouping];
- animationEndFrame_ = newFrame;
} else {
- [self setFrame:newFrame];
+ [self setFrame:animationEndFrame_];
[self setNeedsDisplay:YES];
}
}
« no previous file with comments | « no previous file | chrome/browser/cocoa/extensions/browser_actions_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698