chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 795663003: [Mac Extensions Toolbar] Make the container's animationEndFrame always valid

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/toolbar/toolbar_controller.mm

Issue 795663003: [Mac Extensions Toolbar] Make the container's animationEndFrame always valid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/extensions/browser_actions_container_view.mm ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.h » ('j') | chrome/browser/ui/toolbar/toolbar_actions_bar.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 2c6115b7d73f62d0b134cfecc4637837993cabad..62062f48dcb7fc59175da6c8c479afa49aa4901d 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -669,11 +669,8 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate {

CGFloat edgeXPos = [wrenchButton_ frame].origin.x;

leftDistance = edgeXPos - locationBarXPos - kWrenchMenuLeftPadding;

} else {

- NSRect containerFrame = animate ?

- [browserActionsContainerView_ animationEndFrame] :

- [browserActionsContainerView_ frame];

- leftDistance = containerFrame.origin.x - locationBarXPos;

+ leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -

+ locationBarXPos;

}

if (leftDistance != 0.0)

[self adjustLocationSizeBy:leftDistance animate:animate];