Chromium Code Reviews| Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| index 1564f0c8bc974b6852ae0f5d895d4bb0a7a869e1..b6ce3acc059d881b2597ef04cee0481b18c728ad 100644 |
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| @@ -761,9 +761,15 @@ - (void)windowDidEnterFullScreen:(NSNotification*)notification { |
| [self showFullscreenExitBubbleIfNecessary]; |
| browser_->WindowFullscreenStateChanged(); |
| + |
| + if (fullscreenLowPowerCoordinator_) |
| + fullscreenLowPowerCoordinator_->SetInFullscreenTransition(false); |
|
spqchan
2016/06/07 22:30:32
Why aren't we setting it to true in windowWillEnte
ccameron
2016/06/07 23:12:50
Good point -- updated.
|
| } |
| - (void)windowWillExitFullScreen:(NSNotification*)notification { |
| + if (fullscreenLowPowerCoordinator_) |
| + fullscreenLowPowerCoordinator_->SetInFullscreenTransition(true); |
| + |
| if (notification) // For System Fullscreen when non-nil. |
| [self registerForContentViewResizeNotifications]; |
| exitingAppKitFullscreen_ = YES; |
| @@ -1268,4 +1274,19 @@ - (BOOL)isFullscreenForTabContentOrExtension { |
| controller->IsExtensionFullscreenOrPending(); |
| } |
| +- (void)windowWillBeginSheet:(NSNotification*)notification { |
| + if (fullscreenLowPowerCoordinator_) |
| + fullscreenLowPowerCoordinator_->SetHasActiveSheet(true); |
| +} |
| + |
| +- (void)windowDidEndSheet:(NSNotification*)notification { |
| + if (fullscreenLowPowerCoordinator_) |
| + fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); |
| +} |
| + |
| +- (void)childWindowsDidChange { |
| + if (fullscreenLowPowerCoordinator_) |
| + fullscreenLowPowerCoordinator_->ChildWindowsChanged(); |
| +} |
| + |
| @end // @implementation BrowserWindowController(Private) |