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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 2738043002: [Mac] Fullscreen Toolbar Fixes (Closed)
Patch Set: Fixed test Created 3 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
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 03216863ed3c72e7418b1d4dcbf398584a8e4f4f..c7ae5d721dd633b8f4920e70c3aeb3a13e2e9afe 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -970,19 +970,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]];
@@ -998,7 +990,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])

Powered by Google App Engine
This is Rietveld 408576698