Mac: Make ui/base/cocoa WindowAnimator

chrome/browser/ui/cocoa/base_bubble_controller.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/string_util.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 
 @interface BaseBubbleController (Private)
+- (InfoBubbleWindow*)bubbleWindow;
 - (void)registerForNotifications;
 - (void)updateOriginFromAnchor;
 - (void)activateTabWithContents:(content::WebContents*)newContents
                previousContents:(content::WebContents*)oldContents
                         atIndex:(NSInteger)index
                          reason:(int)reason;
 - (void)recordAnchorOffset;
 - (void)parentWindowDidResize:(NSNotification*)notification;
 - (void)parentWindowWillClose:(NSNotification*)notification;
 - (void)parentWindowWillBecomeFullScreen:(NSNotification*)notification;
@@ skipping 77 matching lines @@
   }
 
   [bubble_ setArrowLocation:info_bubble::kTopRight];
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
+- (InfoBubbleWindow*)bubbleWindow {
+  return base::mac::ObjCCastStrict<InfoBubbleWindow>([self window]);
+}
+
 - (void)registerForNotifications {
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   // Watch to see if the parent window closes, and if so, close this one.
   [center addObserver:self
              selector:@selector(parentWindowWillClose:)
                  name:NSWindowWillCloseNotification
                object:parentWindow_];
   // Watch for the full screen event, if so, close the bubble
   [center addObserver:self
              selector:@selector(parentWindowWillBecomeFullScreen:)
@@ skipping 99 matching lines @@
   if (shouldOpenAsKeyWindow_)
     [window makeKeyAndOrderFront:self];
   else
     [window orderFront:nil];
   [self registerKeyStateEventTap];
   [self recordAnchorOffset];
 }
 
 - (void)close {
   [self closeCleanup];
-  [super close];
+  [[self bubbleWindow] animateClose];
 }
 
 // The controller is the delegate of the window so it receives did resign key
 // notifications. When key is resigned mirror Windows behavior and close the
 // window.
 - (void)windowDidResignKey:(NSNotification*)notification {
   NSWindow* window = [self window];
   DCHECK_EQ([notification object], window);
 
   // If the window isn't visible, it is already closed, and this notification
   // has been sent as part of the closing operation, so no need to close.
   if (![window isVisible])
     return;
 
   // Don't close when explicily disabled, or if there's an attached sheet (e.g.
   // Open File dialog).
   if ([self shouldCloseOnResignKey] && ![window attachedSheet]) {
     [self close];
     return;
   }
 
   // The bubble should not receive key events when it is no longer key window,
   // so disable sharing parent key state. Share parent key state is only used
   // to enable the close/minimize/maximize buttons of the parent window when
   // the bubble has key state, so disabling it here is safe.
-  InfoBubbleWindow* bubbleWindow =
-      base::mac::ObjCCastStrict<InfoBubbleWindow>([self window]);
-  [bubbleWindow setAllowShareParentKeyState:NO];
+  [[self bubbleWindow] setAllowShareParentKeyState:NO];
 }
 
 - (void)windowDidBecomeKey:(NSNotification*)notification {
   // Re-enable share parent key state to make sure the close/minimize/maximize
   // buttons of the parent window are active.
-  InfoBubbleWindow* bubbleWindow =
-      base::mac::ObjCCastStrict<InfoBubbleWindow>([self window]);
-  [bubbleWindow setAllowShareParentKeyState:YES];
+  [[self bubbleWindow] setAllowShareParentKeyState:YES];
 }
 
 // Since the bubble shares first responder with its parent window, set event
 // handlers to dismiss the bubble when it would normally lose key state.
 // Events on sheets are ignored: this assumes the sheet belongs to the bubble
 // since, to affect a sheet on a different window, the bubble would also lose
 // key status in -[NSWindowDelegate windowDidResignKey:]. This keeps the logic
 // simple, since -[NSWindow attachedSheet] returns nil while the sheet is still
 // closing.
 - (void)registerKeyStateEventTap {
@@ skipping 98 matching lines @@
 
 - (void)activateTabWithContents:(content::WebContents*)newContents
                previousContents:(content::WebContents*)oldContents
                         atIndex:(NSInteger)index
                          reason:(int)reason {
   // The user switched tabs; close.
   [self close];
 }
 
 @end  // BaseBubbleController