[Mac] Update fullscreen state when window is fullscreened natively.

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 142 matching lines @@
     appWindow_->WindowDidResize();
 }
 
 - (void)windowDidEndLiveResize:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidFinishResize();
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
   if (appWindow_)
-    appWindow_->WindowDidFinishResize();
+    appWindow_->WindowDidEnterFullscreen();
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
   if (appWindow_)
-    appWindow_->WindowDidFinishResize();
+    appWindow_->WindowDidExitFullscreen();
 }
 
 - (void)windowDidMove:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidMove();
 }
 
 - (void)windowDidMiniaturize:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidMiniaturize();
@@ skipping 639 matching lines @@
   // - Exit maximized state if resized.
   // - Consider us maximized if resize places us back to maximized location.
   //   This happens when returning from fullscreen.
   NSRect frame = [window() frame];
   NSRect screen = [[window() screen] visibleFrame];
   if (!NSEqualSizes(frame.size, screen.size))
     is_maximized_ = false;
   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();
 }
 
 void NativeAppWindowCocoa::WindowDidResize() {
   app_window_->OnNativeWindowChanged();
   UpdateDraggableRegionViews();
 }
 
 void NativeAppWindowCocoa::WindowDidMove() {
   UpdateRestoredBounds();
   app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidMiniaturize() {
   app_window_->OnNativeWindowChanged();
 }
 
 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())
     Restore();
   else
     Maximize();
 }
 
 bool NativeAppWindowCocoa::HandledByExtensionCommand(NSEvent* event) {
   return extension_keybinding_registry_->ProcessKeyEvent(
@@ skipping 83 matching lines @@
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }
 
 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {
   [window() orderOut:window_controller_];
 }