| 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 #import "base/auto_reset.h" | 9 #import "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 910 if (!NSIsEmptyRect(output.bookmarkFrame)) | 910 if (!NSIsEmptyRect(output.bookmarkFrame)) |
| 911 [bookmarkBarController_ layoutToFrame:output.bookmarkFrame]; | 911 [bookmarkBarController_ layoutToFrame:output.bookmarkFrame]; |
| 912 | 912 |
| 913 // The info bar is never hidden. Sometimes it has zero effective height. | 913 // The info bar is never hidden. Sometimes it has zero effective height. |
| 914 [[infoBarContainerController_ view] setFrame:output.infoBarFrame]; | 914 [[infoBarContainerController_ view] setFrame:output.infoBarFrame]; |
| 915 [infoBarContainerController_ | 915 [infoBarContainerController_ |
| 916 setMaxTopArrowHeight:output.infoBarMaxTopArrowHeight]; | 916 setMaxTopArrowHeight:output.infoBarMaxTopArrowHeight]; |
| 917 [infoBarContainerController_ | 917 [infoBarContainerController_ |
| 918 setInfobarArrowX:[self locationBarBridge]->GetPageInfoBubblePoint().x]; | 918 setInfobarArrowX:[self locationBarBridge]->GetPageInfoBubblePoint().x]; |
| 919 | 919 |
| 920 if (!NSIsEmptyRect(output.downloadShelfFrame)) | 920 [[downloadShelfController_ view] setFrame:output.downloadShelfFrame]; |
| 921 [[downloadShelfController_ view] setFrame:output.downloadShelfFrame]; | |
| 922 | 921 |
| 923 [self layoutTabContentArea:output.contentAreaFrame]; | 922 [self layoutTabContentArea:output.contentAreaFrame]; |
| 924 | 923 |
| 925 if (!NSIsEmptyRect(output.fullscreenBackingBarFrame)) { | 924 if (!NSIsEmptyRect(output.fullscreenBackingBarFrame)) { |
| 926 [floatingBarBackingView_ setFrame:output.fullscreenBackingBarFrame]; | 925 [floatingBarBackingView_ setFrame:output.fullscreenBackingBarFrame]; |
| 927 [fullscreenToolbarController_ | 926 [fullscreenToolbarController_ |
| 928 updateToolbarFrame:output.fullscreenBackingBarFrame]; | 927 updateToolbarFrame:output.fullscreenBackingBarFrame]; |
| 929 } | 928 } |
| 930 | 929 |
| 931 [findBarCocoaController_ | 930 [findBarCocoaController_ |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1178 if (fullscreenLowPowerCoordinator_) | 1177 if (fullscreenLowPowerCoordinator_) |
| 1179 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); | 1178 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); |
| 1180 } | 1179 } |
| 1181 | 1180 |
| 1182 - (void)childWindowsDidChange { | 1181 - (void)childWindowsDidChange { |
| 1183 if (fullscreenLowPowerCoordinator_) | 1182 if (fullscreenLowPowerCoordinator_) |
| 1184 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); | 1183 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); |
| 1185 } | 1184 } |
| 1186 | 1185 |
| 1187 @end // @implementation BrowserWindowController(Private) | 1186 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |