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

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

Issue 2435593008: Cocoa: Fix a constraint violation when navigating away from a detached bookmark bar. (Closed)
Patch Set: redundant Created 4 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
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d957efbac05b90e173d9a6c9f20f92a2f4dc5ce9..7d872ec21c640cc876f5ad25861fe7945860a7c6 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -981,16 +981,8 @@ willPositionSheet:(NSWindow*)sheet
if (!NSIsEmptyRect(output.toolbarFrame))
[[toolbarController_ view] setFrame:output.toolbarFrame];
- if (!NSIsEmptyRect(output.bookmarkFrame)) {
- NSView* bookmarkBarView = [bookmarkBarController_ view];
tapted 2016/10/21 04:51:30 confusingly, this was not a `BookmarkBarView*`, bu
- [bookmarkBarView setFrame:output.bookmarkFrame];
-
- // Pin the bookmark bar to the top of the window and make the width
- // flexible.
- [bookmarkBarView setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
-
- [bookmarkBarController_ layoutSubviews];
- }
+ if (!NSIsEmptyRect(output.bookmarkFrame))
+ [bookmarkBarController_ layoutToFrame:output.bookmarkFrame];
// The info bar is never hidden. Sometimes it has zero effective height.
[[infoBarContainerController_ view] setFrame:output.infoBarFrame];
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698