Implemented fullscreen exit animation with AppKit

chrome/browser/ui/cocoa/browser_window_controller_private.mm

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 4d02ca5a9d775444404b2ad90fb15fccdfb5749f..4b8bdbc239bfed71ca074a5160e313158a51986e 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -22,7 +22,7 @@
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window_state.h"
-#import "chrome/browser/ui/cocoa/browser_window_enter_fullscreen_transition.h"
+#import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
@@ -38,6 +38,7 @@
 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
@@ -221,6 +222,7 @@ willPositionSheet:(NSWindow*)sheet
     [(id)self.window setShouldHideTitle:![self hasTitleBar]];
 
   [bookmarkBarController_ updateHiddenState];
+

[erikchen, 2015/08/11 22:42:54]

please don't randomly add whitespace

[spqchan1, 2015/08/12 19:34:41]

Done.

   [self updateSubviewZOrder];
 
   base::scoped_nsobject<BrowserWindowLayout> layout(
@@ -706,12 +708,11 @@ willPositionSheet:(NSWindow*)sheet
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
-  enterFullscreenTransition_.reset();
-
   // In Yosemite, some combination of the titlebar and toolbar always show in
   // full-screen mode. We do not want either to show. Search for the window that
   // contains the views, and hide it. There is no need to ever unhide the view.
   // http://crbug.com/380235
+  fullscreenTransition_.reset();

[erikchen, 2015/08/11 22:42:54]

I see that you changed s/enterFullscreenTransition_/fullscreenTransition_, but
why did you move its location? You moved it under a comment, which implies that
the comment applies to it.

[spqchan1, 2015/08/12 19:34:41]

Originally, fullscreenTransition was going take care of both enter and exit
transition. The object would be created at enterTransition and then removed at
exitTransition.

However, after refactoring the code, it made more sense to create the object at
the beginning of enterTransition and then destroy it at the end of
enterTransition. The same thing will happen with exitTransition. As such, I
added back fullscreenTransition_.reset()

Anyways, I'll move it back to the top of the method. Note: in
windowDidExitFullScreen, I moved reset() to the end because I want the layout to
be updated before getting rid of the fullscreenTransition object (which contains
the window size layout parameter logic)

   if (base::mac::IsOSYosemiteOrLater()) {
     for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
       if ([window
@@ -761,25 +762,43 @@ willPositionSheet:(NSWindow*)sheet
 - (void)windowWillExitFullScreen:(NSNotification*)notification {
   if (notification)  // For System Fullscreen when non-nil.
     [self registerForContentViewResizeNotifications];
+  exitingAppKitFullscreen_ = YES;
+
   [self destroyFullscreenExitBubbleIfNecessary];
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
+  DCHECK(exitingAppKitFullscreen_);
+
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
+
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  [framedBrowserWindow setFrameAndStyleMaskLock:NO];
+
+  [self layoutSubviews];
   browser_->WindowFullscreenStateChanged();
+
+  exitingAppKitFullscreen_ = NO;
+  fullscreenTransition_.reset();
 }
 
 - (void)windowDidFailToEnterFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
   enteringAppKitFullscreen_ = NO;
+  fullscreenTransition_.reset();
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow*)window {
   [self deregisterForContentViewResizeNotifications];
-
+  exitingAppKitFullscreen_ = NO;
+  fullscreenTransition_.reset();
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  [framedBrowserWindow setFrameAndStyleMaskLock:NO];
   // Force a relayout to try and get the window back into a reasonable state.
   [self layoutSubviews];
 }
@@ -876,7 +895,12 @@ willPositionSheet:(NSWindow*)sheet
 
 - (void)updateLayoutParameters:(BrowserWindowLayout*)layout {
   [layout setContentViewSize:[[[self window] contentView] bounds].size];
-  [layout setWindowSize:[[self window] frame].size];
+
+  NSSize windowSize = (fullscreenTransition_.get())
+                          ? [fullscreenTransition_ getDesiredWindowLayoutSize]
+                          : [[self window] frame].size;
+
+  [layout setWindowSize:windowSize];
 
   [layout setInAnyFullscreen:[self isInAnyFullscreenMode]];
   [layout setFullscreenSlidingStyle:
@@ -1094,21 +1118,43 @@ willPositionSheet:(NSWindow*)sheet
   if (![self shouldUseCustomAppKitFullscreenTransition])
     return nil;
 
-  enterFullscreenTransition_.reset(
-      [[BrowserWindowEnterFullscreenTransition alloc]
-          initWithWindow:self.window]);
-  return [enterFullscreenTransition_ customWindowsToEnterFullScreen];
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
+      initEnterWithWindow:framedBrowserWindow]);
+  return [fullscreenTransition_ customWindowsForFullScreenTransition];
+}
+
+- (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window {
+  DCHECK([window isEqual:self.window]);
+
+  if (![self shouldUseCustomAppKitFullscreenTransition])
+    return nil;
+
+  FramedBrowserWindow* framedBrowserWindow =
+      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
+  fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
+      initExitWithWindow:framedBrowserWindow
+                   frame:savedRegularWindowFrame_]);
+
+  return [fullscreenTransition_ customWindowsForFullScreenTransition];
 }
 
 - (void)window:(NSWindow*)window
     startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration {
   DCHECK([window isEqual:self.window]);
-  [enterFullscreenTransition_
-      startCustomAnimationToEnterFullScreenWithDuration:duration];
+  [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
+}
+
+- (void)window:(NSWindow*)window
+    startCustomAnimationToExitFullScreenWithDuration:(NSTimeInterval)duration {
+  DCHECK([window isEqual:self.window]);
+
+  [fullscreenTransition_ startCustomFullScreenAnimationWithDuration:duration];
 }
 
 - (BOOL)shouldConstrainFrameRect {
-  if ([enterFullscreenTransition_ shouldWindowBeUnconstrained])
+  if ([fullscreenTransition_ shouldWindowBeUnconstrained])
     return NO;
 
   return [super shouldConstrainFrameRect];