Fix restoring a window after maximizing it. (Mac)

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

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 43107fe03f8e28976e23036e44051d0a26e28c98..a94e173c4f4cd68c0369a3d47e33a8a1d85a44bd 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm
@@ -56,7 +56,8 @@ using apps::ShellWindow;
 @end
 
 enum {
-  NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7
+  NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
+  NSFullScreenWindowMask = 1 << 14
 };
 
 #endif  // MAC_OS_X_VERSION_10_7
@@ -85,6 +86,21 @@ enum {
     appWindow_->WindowDidResize();
 }
 
+- (void)windowDidEndLiveResize:(NSNotification*)notification {
+  if (appWindow_)
+    appWindow_->WindowDidFinishResize();
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification*)notification {
+  if (appWindow_)
+    appWindow_->WindowDidFinishResize();
+}
+
+- (void)windowDidExitFullScreen:(NSNotification*)notification {
+  if (appWindow_)
+    appWindow_->WindowDidFinishResize();
+}
+
 - (void)windowDidMove:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidMove();
@@ -839,7 +855,7 @@ void NativeAppWindowCocoa::WindowDidResignKey() {
     rwhv->SetActive(false);
 }
 
-void NativeAppWindowCocoa::WindowDidResize() {
+void NativeAppWindowCocoa::WindowDidFinishResize() {
   // Update |is_maximized_| if needed:
   // - Exit maximized state if resized.
   // - Consider us maximized if resize places us back to maximized location.
@@ -851,7 +867,13 @@ void NativeAppWindowCocoa::WindowDidResize() {
   else if (NSEqualPoints(frame.origin, screen.origin))
     is_maximized_ = true;
 
+  // Update |is_fullscreen_| if needed.
+  is_fullscreen_ = ([window() styleMask] & NSFullScreenWindowMask) != 0;
+
   UpdateRestoredBounds();
+}
+
+void NativeAppWindowCocoa::WindowDidResize() {

[scheib, 2013/09/24 16:04:15]

Certain you don't need UpdaterestoredBounds() in this method?
OnNativeWindowChanged will attempt to save to geometry cache stale data
otherwise I think.

[jackhou1, 2013/09/24 21:34:25]

WindowDidResize is called repeatedly while a window is being resized or
animating. During that time, we want the restored_bounds_ to contain the bounds
of the window before the resize/animation started. Once the resize/animation is
finished, WindowDidFinishResize will update the new bounds. It should probably
call OnNativeWindowChanged as well, to ensure the new bounds are saved.

[tapted, 2013/09/24 23:23:14]

I got the impression from the Apple docs (i.e.
https://developer.apple.com/library/mac/documentation/cocoa/reference/Applica...
and
https://developer.apple.com/library/mac/documentation/cocoa/conceptual/CocoaP...
) that WindowDidFinishResize is guaranteed to be sent after a resize (since
10.1) - so the geometry data should always get a refresh once the size is
stable. I also got the impression that the size couldn't change between the last
WindowDidResize() and the WindowDidFinishResize(), so adding
OnNativeWindowChanged to WindowDidFinishResize might be redundant, and cause a
re-layout for some apps -- can you check the frame size never changes between
the last WindowDidResize and the WindowDidFinishResize?

However, one thing to check is whether WindowDidFinishResize is sent for
API-initiated resizes (i.e. non-user). A re-read of the wording in the
documentation suggests: "maybe" :/. But it would be pretty crap for Cocoa to
change this behaviour depending on the 'animate' argument to [NSWindow
setFrame:]

[jackhou1, 2013/09/30 01:46:33]

You're right, the frame size is the same.
 
Good catch, it does not call WindowDidFinishResize. The API-initiated resizes
use SetBounds, so added WindowDidFinishResize to that.

   shell_window_->OnNativeWindowChanged();
 }