| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #import "base/mac/scoped_nsobject.h" | 10 #import "base/mac/scoped_nsobject.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 // Place the download shelf, if any, at the bottom of the view. | 270 // Place the download shelf, if any, at the bottom of the view. |
| 271 minY = [self layoutDownloadShelfAtMinX:minX minY:minY width:width]; | 271 minY = [self layoutDownloadShelfAtMinX:minX minY:minY width:width]; |
| 272 | 272 |
| 273 // Finally, the content area takes up all of the remaining space. | 273 // Finally, the content area takes up all of the remaining space. |
| 274 NSRect contentAreaRect = NSMakeRect(minX, minY, width, maxY - minY); | 274 NSRect contentAreaRect = NSMakeRect(minX, minY, width, maxY - minY); |
| 275 [self layoutTabContentArea:contentAreaRect]; | 275 [self layoutTabContentArea:contentAreaRect]; |
| 276 | 276 |
| 277 // Normally, we don't need to tell the toolbar whether or not to show the | 277 // Normally, we don't need to tell the toolbar whether or not to show the |
| 278 // divider, but things break down during animation. | 278 // divider, but things break down during animation. |
| 279 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; | 279 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; |
| 280 | |
| 281 // Update the position of the active constrained window sheet. We force this | |
| 282 // here because the |sheetParentView| may not have been resized (e.g., to | |
| 283 // prevent jank during a fullscreen mode transition), but constrained window | |
| 284 // sheets also compute their position based on the bookmark bar and toolbar. | |
| 285 content::WebContents* const activeWebContents = | |
| 286 browser_->tab_strip_model()->GetActiveWebContents(); | |
| 287 NSView* const sheetParentView = activeWebContents ? | |
| 288 GetSheetParentViewForWebContents(activeWebContents) : nil; | |
| 289 if (sheetParentView) { | |
| 290 [[NSNotificationCenter defaultCenter] | |
| 291 postNotificationName:NSViewFrameDidChangeNotification | |
| 292 object:sheetParentView]; | |
| 293 } | |
| 294 } | 280 } |
| 295 | 281 |
| 296 - (CGFloat)floatingBarHeight { | 282 - (CGFloat)floatingBarHeight { |
| 297 if (![self inPresentationMode]) | 283 if (![self inPresentationMode]) |
| 298 return 0; | 284 return 0; |
| 299 | 285 |
| 300 CGFloat totalHeight = [presentationModeController_ floatingBarVerticalOffset]; | 286 CGFloat totalHeight = [presentationModeController_ floatingBarVerticalOffset]; |
| 301 | 287 |
| 302 if ([self hasTabStrip]) | 288 if ([self hasTabStrip]) |
| 303 totalHeight += NSHeight([[self tabStripView] frame]); | 289 totalHeight += NSHeight([[self tabStripView] frame]); |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1009 } | 995 } |
| 1010 } | 996 } |
| 1011 | 997 |
| 1012 - (void)updateInfoBarTipVisibility { | 998 - (void)updateInfoBarTipVisibility { |
| 1013 // If there's no toolbar then hide the infobar tip. | 999 // If there's no toolbar then hide the infobar tip. |
| 1014 [infoBarContainerController_ | 1000 [infoBarContainerController_ |
| 1015 setShouldSuppressTopInfoBarTip:![self hasToolbar]]; | 1001 setShouldSuppressTopInfoBarTip:![self hasToolbar]]; |
| 1016 } | 1002 } |
| 1017 | 1003 |
| 1018 @end // @implementation BrowserWindowController(Private) | 1004 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |