Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
index ecd390eff3b41b9a1d54f83c8de52b362bc64993..521f095bc950c25e21fbd056b6138c293966fa77 100644 |
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
@@ -160,12 +160,12 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions( |
- (void)windowDidEnterFullScreen:(NSNotification*)notification { |
if (appWindow_) |
- appWindow_->WindowDidFinishResize(); |
+ appWindow_->WindowDidEnterFullscreen(); |
} |
- (void)windowDidExitFullScreen:(NSNotification*)notification { |
if (appWindow_) |
- appWindow_->WindowDidFinishResize(); |
+ appWindow_->WindowDidExitFullscreen(); |
} |
- (void)windowDidMove:(NSNotification*)notification { |
@@ -825,13 +825,6 @@ void NativeAppWindowCocoa::WindowDidFinishResize() { |
else if (NSEqualPoints(frame.origin, screen.origin)) |
is_maximized_ = true; |
- // Update |is_fullscreen_| if needed. |
- is_fullscreen_ = ([window() styleMask] & NSFullScreenWindowMask) != 0; |
- // If not fullscreen but the window is constrained, disable the fullscreen UI |
- // control. |
- if (!is_fullscreen_ && !shows_fullscreen_controls_) |
- SetFullScreenCollectionBehavior(window(), false); |
- |
UpdateRestoredBounds(); |
} |
@@ -853,6 +846,21 @@ void NativeAppWindowCocoa::WindowDidDeminiaturize() { |
app_window_->OnNativeWindowChanged(); |
} |
+void NativeAppWindowCocoa::WindowDidEnterFullscreen() { |
+ is_fullscreen_ = true; |
+ app_window_->OSFullscreen(); |
+ app_window_->OnNativeWindowChanged(); |
+} |
+ |
+void NativeAppWindowCocoa::WindowDidExitFullscreen() { |
+ is_fullscreen_ = false; |
+ if (!shows_fullscreen_controls_) |
+ SetFullScreenCollectionBehavior(window(), false); |
+ |
+ app_window_->Restore(); |
+ app_window_->OnNativeWindowChanged(); |
+} |
+ |
void NativeAppWindowCocoa::WindowWillZoom() { |
// See top of file NOTE: Maximize and Zoom. |
if (IsMaximized()) |