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

Unified Diff: chrome/browser/cocoa/toolbar_controller.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 | « chrome/browser/cocoa/extensions/browser_actions_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/toolbar_controller.mm
===================================================================
--- chrome/browser/cocoa/toolbar_controller.mm (revision 43254)
+++ chrome/browser/cocoa/toolbar_controller.mm (working copy)
@@ -671,7 +671,8 @@
}
- (void)browserActionsVisibilityChanged:(NSNotification*)notification {
- [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:NO];
+ [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:
+ [[[self view] window] isVisible]];
}
- (void)pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
@@ -679,7 +680,9 @@
CGFloat leftPadding;
if ([browserActionsContainerView_ isHidden]) {
- leftPadding = NSWidth([[goButton_ window] frame]) - goXPos;
+ CGFloat edgeXPos = [pageButton_ isHidden] ?
+ NSWidth([[goButton_ window] frame]) : [pageButton_ frame].origin.x;
+ leftPadding = edgeXPos - goXPos;
} else {
NSRect containerFrame = animate ?
[browserActionsContainerView_ animationEndFrame] :
« no previous file with comments | « chrome/browser/cocoa/extensions/browser_actions_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698