| Index: chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm
|
| index dea4c91276a0520d40cd7062e677b13b02d44593..7e2ab57c3f29413a5ffd6ea6f562d64d73886232 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm
|
| @@ -318,27 +318,27 @@ CGFloat kMinWidth = 320.0;
|
| dismissButtonSize.height)];
|
| currentMaxWidth -= (dismissButtonSize.width + kButtonPadding);
|
| }
|
| + int leftAlignXPos = kHorizontalPadding;
|
| + if (iconView_) {
|
| + CGFloat extraViewIconHeight =
|
| + currentHeight + (buttonStripHeight - extraViewIconSize.height) / 2.0;
|
| +
|
| + [iconView_
|
| + setFrame:NSMakeRect(leftAlignXPos, extraViewIconHeight,
|
| + extraViewIconSize.width, extraViewIconSize.height)];
|
| + leftAlignXPos += extraViewIconSize.width + kButtonPadding;
|
| + }
|
| if (label_ || link_) {
|
| CGFloat extraViewTextHeight =
|
| currentHeight + (buttonStripHeight - extraViewTextSize.height) / 2.0;
|
| - NSRect frame = NSMakeRect(currentMaxWidth - extraViewTextSize.width,
|
| - extraViewTextHeight, extraViewTextSize.width,
|
| - extraViewTextSize.height);
|
| + NSRect frame =
|
| + NSMakeRect(leftAlignXPos, extraViewTextHeight, extraViewTextSize.width,
|
| + extraViewTextSize.height);
|
| if (link_) {
|
| [link_ setFrame:frame];
|
| } else {
|
| [label_ setFrame:frame];
|
| }
|
| - currentMaxWidth -= extraViewTextSize.width + kButtonPadding;
|
| - }
|
| - if (iconView_) {
|
| - CGFloat extraViewIconHeight =
|
| - currentHeight + (buttonStripHeight - extraViewIconSize.height) / 2.0;
|
| -
|
| - [iconView_
|
| - setFrame:NSMakeRect(kHorizontalPadding, extraViewIconHeight,
|
| - extraViewIconSize.width, extraViewIconSize.height)];
|
| - currentMaxWidth -= extraViewIconSize.width + kButtonPadding;
|
| }
|
| // Buttons have some inherit padding of their own, so we don't need quite as
|
| // much space here.
|
|
|