| Index: chrome/browser/ui/cocoa/browser_window_layout.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_layout.mm b/chrome/browser/ui/cocoa/browser_window_layout.mm
|
| index b9dc6328d96078f6ed13db66fb3950db546c4192..0ab98c7bdb859bfcac8aa3891e07db578b521884 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_layout.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_layout.mm
|
| @@ -280,8 +280,14 @@ const CGFloat kLocationBarRightOffset = 35;
|
|
|
| // Lay out the toolbar.
|
| if (parameters.hasToolbar) {
|
| - output_.toolbarFrame = NSMakeRect(
|
| - 0, maxY - parameters_.toolbarHeight, width, parameters_.toolbarHeight);
|
| + CGFloat toolbarY = maxY;
|
| + if (parameters_.inAnyFullscreen &&
|
| + parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_NONE) {
|
| + toolbarY = parameters_.windowSize.height + fullscreenYOffset_;
|
| + }
|
| +
|
| + output_.toolbarFrame = NSMakeRect(0, toolbarY - parameters_.toolbarHeight,
|
| + width, parameters_.toolbarHeight);
|
| maxY = NSMinY(output_.toolbarFrame);
|
| } else if (parameters_.hasLocationBar) {
|
| CGFloat toolbarX = kLocBarLeftRightInset;
|
|
|