Mac: prevent the overlay from sliding in and out on fullscreen mode switch.

BUG=35959
TEST=Go to various web pages, focus various things, switch in and out of fullscreen mode; overlay should never slide in and then out (it should either be and stay in, if appropriate, or be out and stay out).

Review URL: http://codereview.chromium.org/601090

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39258 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/fullscreen_controller.mm b/chrome/browser/cocoa/fullscreen_controller.mm
index f50643b..be90cf6 100644
--- a/chrome/browser/cocoa/fullscreen_controller.mm
+++ b/chrome/browser/cocoa/fullscreen_controller.mm
@@ -233,6 +233,12 @@ const NSTimeInterval kDropdownHideDelay = 0.2;
   }
 }
 
+- (void)cancelAnimationAndTimers {
+  [self cancelAllTimers];
+  [currentAnimation_ stopAnimation];
+  currentAnimation_.reset();
+}
+
 // Used to activate the floating bar in fullscreen mode.
 - (void)mouseEntered:(NSEvent*)event {
   DCHECK(isFullscreen_);
@@ -459,10 +465,7 @@ const NSTimeInterval kDropdownHideDelay = 0.2;
 
 - (void)cleanup {
   [self cancelMouseExitCheck];
-  [self cancelAllTimers];
-
-  [currentAnimation_ stopAnimation];
-  currentAnimation_.reset();
+  [self cancelAnimationAndTimers];
 
   [contentView_ removeTrackingArea:trackingArea_];
   contentView_ = nil;