Chromium Code Reviews| 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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 742 CGFloat heightDelta = | 742 CGFloat heightDelta = |
| 743 expectedFrame.size.height - currentFrame.size.height; | 743 expectedFrame.size.height - currentFrame.size.height; |
| 744 if (fabs(heightDelta - kExpectedHeightDifference) > 0.01) | 744 if (fabs(heightDelta - kExpectedHeightDifference) > 0.01) |
| 745 return; | 745 return; |
| 746 | 746 |
| 747 [[self window] setFrame:expectedFrame display:YES]; | 747 [[self window] setFrame:expectedFrame display:YES]; |
| 748 }); | 748 }); |
| 749 base::MessageLoop::current()->PostTask(FROM_HERE, callback); | 749 base::MessageLoop::current()->PostTask(FROM_HERE, callback); |
| 750 } | 750 } |
| 751 | 751 |
| 752 [self setSheetHiddenForFullscreenTransition:NO]; | |
|
spqchan
2016/06/03 01:30:09
Removing this because it's redundant. (This was ge
| |
| 753 | |
| 754 if (notification) // For System Fullscreen when non-nil. | 752 if (notification) // For System Fullscreen when non-nil. |
| 755 [self deregisterForContentViewResizeNotifications]; | 753 [self deregisterForContentViewResizeNotifications]; |
| 756 | 754 |
| 757 enteringImmersiveFullscreen_ = NO; | 755 enteringImmersiveFullscreen_ = NO; |
| 758 enteringPresentationMode_ = NO; | 756 enteringPresentationMode_ = NO; |
| 759 | 757 |
| 760 [self resetCustomAppKitFullscreenVariables]; | 758 [self resetCustomAppKitFullscreenVariables]; |
| 761 [[tabStripController_ activeTabContentsController] | 759 [[tabStripController_ activeTabContentsController] |
| 762 updateFullscreenWidgetFrame]; | 760 updateFullscreenWidgetFrame]; |
| 763 | 761 |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1268 } | 1266 } |
| 1269 | 1267 |
| 1270 - (BOOL)isFullscreenForTabContentOrExtension { | 1268 - (BOOL)isFullscreenForTabContentOrExtension { |
| 1271 FullscreenController* controller = | 1269 FullscreenController* controller = |
| 1272 browser_->exclusive_access_manager()->fullscreen_controller(); | 1270 browser_->exclusive_access_manager()->fullscreen_controller(); |
| 1273 return controller->IsWindowFullscreenForTabOrPending() || | 1271 return controller->IsWindowFullscreenForTabOrPending() || |
| 1274 controller->IsExtensionFullscreenOrPending(); | 1272 controller->IsExtensionFullscreenOrPending(); |
| 1275 } | 1273 } |
| 1276 | 1274 |
| 1277 @end // @implementation BrowserWindowController(Private) | 1275 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |