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

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

Issue 1305143008: [Mac] Implement LocationBarViewMac::UpdateLocationBarVisibility() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment Created 5 years, 2 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_layout.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_layout.mm b/chrome/browser/ui/cocoa/browser_window_layout.mm
index a0278250fcc469912e596d36096f5af5a6a50d76..6bee3330e9dfc4cebfa1a0864c3118344cef9d1f 100644
--- a/chrome/browser/ui/cocoa/browser_window_layout.mm
+++ b/chrome/browser/ui/cocoa/browser_window_layout.mm
@@ -124,6 +124,10 @@ const CGFloat kLocationBarRightOffset = 35;
parameters_.avatarLineWidth = avatarLineWidth;
}
+- (void)setToolbarHidden:(BOOL)toolbarHidden {
+ parameters_.toolbarHidden = toolbarHidden;
+}
+
- (void)setHasToolbar:(BOOL)hasToolbar {
parameters_.hasToolbar = hasToolbar;
}
@@ -271,17 +275,19 @@ const CGFloat kLocationBarRightOffset = 35;
CGFloat width = parameters_.contentViewSize.width;
// Lay out the toolbar.
- if (parameters.hasToolbar) {
- output_.toolbarFrame = NSMakeRect(
- 0, maxY - parameters_.toolbarHeight, width, parameters_.toolbarHeight);
- maxY = NSMinY(output_.toolbarFrame);
- } else if (parameters_.hasLocationBar) {
- CGFloat toolbarX = kLocBarLeftRightInset;
- CGFloat toolbarY = maxY - parameters_.toolbarHeight - kLocBarTopInset;
- CGFloat toolbarWidth = width - 2 * kLocBarLeftRightInset;
- output_.toolbarFrame =
- NSMakeRect(toolbarX, toolbarY, toolbarWidth, parameters_.toolbarHeight);
- maxY = NSMinY(output_.toolbarFrame) - kLocBarBottomInset;
+ if (!parameters.toolbarHidden) {
+ if (parameters.hasToolbar) {
+ output_.toolbarFrame = NSMakeRect(0, maxY - parameters_.toolbarHeight,
+ width, parameters_.toolbarHeight);
+ maxY = NSMinY(output_.toolbarFrame);
+ } else if (parameters_.hasLocationBar) {
+ CGFloat toolbarX = kLocBarLeftRightInset;
+ CGFloat toolbarY = maxY - parameters_.toolbarHeight - kLocBarTopInset;
+ CGFloat toolbarWidth = width - 2 * kLocBarLeftRightInset;
+ output_.toolbarFrame = NSMakeRect(toolbarX, toolbarY, toolbarWidth,
+ parameters_.toolbarHeight);
+ maxY = NSMinY(output_.toolbarFrame) - kLocBarBottomInset;
+ }
}
// Lay out the bookmark bar, if it's above the info bar.

Powered by Google App Engine
This is Rietveld 408576698