| Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| index f084fb039ddfc634afb1cc0415d6dd245e856c66..6bd97b47c6b97794cbda7a17ea616a6055b9b58e 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -968,19 +968,11 @@ willPositionSheet:(NSWindow*)sheet
|
| - (void)updateSubviewZOrderFullscreen {
|
| base::scoped_nsobject<NSMutableArray> subviews([[NSMutableArray alloc] init]);
|
|
|
| - // The infobar should overlay the toolbar if the toolbar is fully shown.
|
| - FullscreenToolbarLayout layout = [fullscreenToolbarController_ computeLayout];
|
| - BOOL shouldInfoBarOverlayToolbar =
|
| - ui::IsCGFloatEqual(layout.toolbarFraction, 1.0);
|
| -
|
| if ([downloadShelfController_ view])
|
| [subviews addObject:[downloadShelfController_ view]];
|
| if ([self tabContentArea])
|
| [subviews addObject:[self tabContentArea]];
|
|
|
| - if (!shouldInfoBarOverlayToolbar && [infoBarContainerController_ view])
|
| - [subviews addObject:[infoBarContainerController_ view]];
|
| -
|
| if ([self placeBookmarkBarBelowInfoBar]) {
|
| if ([bookmarkBarController_ view])
|
| [subviews addObject:[bookmarkBarController_ view]];
|
| @@ -996,7 +988,7 @@ willPositionSheet:(NSWindow*)sheet
|
| if ([toolbarController_ view])
|
| [subviews addObject:[toolbarController_ view]];
|
|
|
| - if (shouldInfoBarOverlayToolbar && [infoBarContainerController_ view])
|
| + if ([infoBarContainerController_ view])
|
| [subviews addObject:[infoBarContainerController_ view]];
|
|
|
| if ([findBarCocoaController_ view])
|
|
|