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..1c0f49ba084e1ec092f94ed41a97bd8e3842c9ea 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,22 @@ 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();
+}
+

[tapted, 2013/09/24 05:59:24]

nit: extra blank line crept in here

[jackhou1, 2013/09/24 06:39:06]

Done.

+
 - (void)windowDidMove:(NSNotification*)notification {
   if (appWindow_)
     appWindow_->WindowDidMove();
@@ -839,7 +856,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 +868,13 @@ void NativeAppWindowCocoa::WindowDidResize() {
   else if (NSEqualPoints(frame.origin, screen.origin))
     is_maximized_ = true;
 
+  // Update |is_fullscreen_| if needed.
+  is_fullscreen_ = [window() styleMask] & NSFullScreenWindowMask;

[tapted, 2013/09/24 05:59:24]

nit: maybe `([window() styleMask] & NSFullScreenWindowMask) != 0`

I think C++'s `bool` does the right thing w.r.t. overflow, but Objective-C
`BOOL` does not. (i.e. 

BOOL is_fullscreen_ = [window() styleMask] & NSFullScreenWindowMask;

is always `false` because NSFullScreenWindowMask > 256 and BOOL is a typedef,
but since is_fullscreen_ is actually `bool` it's fine -- the compiler does
something smarter than dumb assignment.

[jackhou1, 2013/09/24 06:39:06]

Done.

+
   UpdateRestoredBounds();
+}
+
+void NativeAppWindowCocoa::WindowDidResize() {
   shell_window_->OnNativeWindowChanged();
 }