diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 08:07:13 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 08:07:13 +0000 |
| commit | df157b8d8552ff59188c61666417b7cb72dbbdde (patch) | |
| tree | d4a4d6bfe9ae7ed1398a41f9f64b381624a6bdfb /chrome/browser/ui/cocoa/browser_window_controller_private.mm | |
| parent | b8fcd553efc7ea10dd8dda767266f8d2311bdd2b (diff) | |
| download | chromium_src-df157b8d8552ff59188c61666417b7cb72dbbdde.zip chromium_src-df157b8d8552ff59188c61666417b7cb72dbbdde.tar.gz chromium_src-df157b8d8552ff59188c61666417b7cb72dbbdde.tar.bz2 | |
Revert 190213 "Alternate NTP Mac: Show overlay at fixed position"
BUG=173475, 174077
TBR=sail@chromium.org
Review URL: https://codereview.chromium.org/12913016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_controller_private.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_controller_private.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index 180d4fc..5b20789 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -206,8 +206,8 @@ willPositionSheet:(NSWindow*)sheet DCHECK_LE(maxY, NSMaxY(contentBounds) + yOffset); // Place the toolbar at the top of the reserved area. - CGFloat toolbarTopY = maxY; maxY = [self layoutToolbarAtMinX:minX maxY:maxY width:width]; + CGFloat toolbarBottomY = maxY; // If we're not displaying the bookmark bar below the infobar, then it goes // immediately below the toolbar. @@ -251,10 +251,8 @@ willPositionSheet:(NSWindow*)sheet toolbarToWebContentsOffset_ = 0; contentAreaTop = maxY; } else { - CGFloat minToolbarHeight = [toolbarController_ - desiredHeightForCompression:bookmarks::kBookmarkBarOverlap]; - contentAreaTop = toolbarTopY - minToolbarHeight; - toolbarToWebContentsOffset_ = contentAreaTop - maxY; + toolbarToWebContentsOffset_ = toolbarBottomY - maxY; + contentAreaTop = toolbarBottomY; } [self updateContentOffsets]; @@ -844,6 +842,8 @@ willPositionSheet:(NSWindow*)sheet } - (CGFloat)toolbarDividerOpacity { + if ([self currentInstantUIState] != browser_window_controller::kInstantUINone) + return 1; return [bookmarkBarController_ toolbarDividerOpacity]; } |