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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 | 662 |
663 if (notification) // For System Fullscreen when non-nil. | 663 if (notification) // For System Fullscreen when non-nil. |
664 [self deregisterForContentViewResizeNotifications]; | 664 [self deregisterForContentViewResizeNotifications]; |
665 | 665 |
666 enteringImmersiveFullscreen_ = NO; | 666 enteringImmersiveFullscreen_ = NO; |
667 | 667 |
668 [self resetCustomAppKitFullscreenVariables]; | 668 [self resetCustomAppKitFullscreenVariables]; |
669 [[tabStripController_ activeTabContentsController] | 669 [[tabStripController_ activeTabContentsController] |
670 updateFullscreenWidgetFrame]; | 670 updateFullscreenWidgetFrame]; |
671 | 671 |
| 672 [self invalidateTouchBar]; |
| 673 |
672 [self showFullscreenExitBubbleIfNecessary]; | 674 [self showFullscreenExitBubbleIfNecessary]; |
673 browser_->WindowFullscreenStateChanged(); | 675 browser_->WindowFullscreenStateChanged(); |
674 | 676 |
675 if (fullscreenLowPowerCoordinator_) | 677 if (fullscreenLowPowerCoordinator_) |
676 fullscreenLowPowerCoordinator_->SetInFullscreenTransition(false); | 678 fullscreenLowPowerCoordinator_->SetInFullscreenTransition(false); |
677 | 679 |
678 if (shouldExitAfterEnteringFullscreen_) { | 680 if (shouldExitAfterEnteringFullscreen_) { |
679 shouldExitAfterEnteringFullscreen_ = NO; | 681 shouldExitAfterEnteringFullscreen_ = NO; |
680 [self exitAppKitFullscreen]; | 682 [self exitAppKitFullscreen]; |
681 } | 683 } |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
720 fullscreenLowPowerCoordinator_.reset(); | 722 fullscreenLowPowerCoordinator_.reset(); |
721 | 723 |
722 if (notification) // For System Fullscreen when non-nil. | 724 if (notification) // For System Fullscreen when non-nil. |
723 [self deregisterForContentViewResizeNotifications]; | 725 [self deregisterForContentViewResizeNotifications]; |
724 | 726 |
725 browser_->WindowFullscreenStateChanged(); | 727 browser_->WindowFullscreenStateChanged(); |
726 [self.chromeContentView setAutoresizesSubviews:YES]; | 728 [self.chromeContentView setAutoresizesSubviews:YES]; |
727 | 729 |
728 [self resetCustomAppKitFullscreenVariables]; | 730 [self resetCustomAppKitFullscreenVariables]; |
729 | 731 |
| 732 [self invalidateTouchBar]; |
| 733 |
730 // Ensures that the permission bubble shows up properly at the front. | 734 // Ensures that the permission bubble shows up properly at the front. |
731 PermissionRequestManager* manager = [self permissionRequestManager]; | 735 PermissionRequestManager* manager = [self permissionRequestManager]; |
732 if (manager && manager->IsBubbleVisible()) { | 736 if (manager && manager->IsBubbleVisible()) { |
733 NSWindow* bubbleWindow = manager->GetBubbleWindow(); | 737 NSWindow* bubbleWindow = manager->GetBubbleWindow(); |
734 DCHECK(bubbleWindow); | 738 DCHECK(bubbleWindow); |
735 [bubbleWindow orderFront:nil]; | 739 [bubbleWindow orderFront:nil]; |
736 } | 740 } |
737 | 741 |
738 // Ensure that the window is layout properly. | 742 // Ensure that the window is layout properly. |
739 [self layoutSubviews]; | 743 [self layoutSubviews]; |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1186 if (fullscreenLowPowerCoordinator_) | 1190 if (fullscreenLowPowerCoordinator_) |
1187 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); | 1191 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); |
1188 } | 1192 } |
1189 | 1193 |
1190 - (void)childWindowsDidChange { | 1194 - (void)childWindowsDidChange { |
1191 if (fullscreenLowPowerCoordinator_) | 1195 if (fullscreenLowPowerCoordinator_) |
1192 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); | 1196 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); |
1193 } | 1197 } |
1194 | 1198 |
1195 @end // @implementation BrowserWindowController(Private) | 1199 @end // @implementation BrowserWindowController(Private) |
OLD | NEW |