Web Intents Mac: Add view animation

chrome/browser/ui/cocoa/intents/web_intent_picker_view_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/intents/web_intent_picker_view_controller.h"
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/flipped_view.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_choose_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_extension_prompt_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_message_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_progress_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/constrained_window_constants.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 @interface WebIntentPickerViewController ()
 
-- (void)performLayout;
+- (void)performLayoutWithOldViewController:
+    (WebIntentViewController*)oldViewController;
 // Gets the view controller currently being displayed.
 - (WebIntentViewController*)currentViewController;
 - (WebIntentPickerState)newPickerState;
 
 // Update the various views to match changes to the picker model.
 - (void)updateWaiting;
 - (void)updateNoService;
 - (void)updateChooseService;
 - (void)updateInlineService;
 - (void)updateInstallingExtension;
@@ skipping 15 matching lines @@
 @end
 
 @implementation WebIntentPickerViewController
 
 - (id)initWithPicker:(WebIntentPickerCocoa2*)picker {
   if ((self = [super init])) {
     picker_ = picker;
 
     scoped_nsobject<NSView> view(
         [[FlippedView alloc] initWithFrame:ui::kWindowSizeDeterminedLater]);
+    [view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     [self setView:view];
 
     closeButton_.reset([[HoverCloseButton alloc] initWithFrame:NSZeroRect]);
     [closeButton_ setTarget:self];
     [closeButton_ setAction:@selector(onCloseButton:)];
     [[closeButton_ cell] setKeyEquivalent:kKeyEquivalentEscape];
     [[self view] addSubview:closeButton_];
 
     chooseServiceViewController_.reset(
         [[WebIntentChooseServiceViewController alloc] init]);
@@ skipping 51 matching lines @@
   return extensionPromptViewController_;
 }
 
 - (void)update {
   // The model may be NULL between the time the dialog is closed and this object
   // is deleted.
   if (!picker_->model())
     return;
 
   WebIntentPickerState newState = [self newPickerState];
-  NSView* currentView = [[self currentViewController] view];
-  if (state_ != newState || ![currentView superview]) {
-    [currentView removeFromSuperview];
-    // Clear the inline webview.
-    [inlineServiceViewController_ setServiceURL:GURL::EmptyGURL()];
-    [extensionPromptViewController_ clear];
+  WebIntentViewController* oldViewController = [self currentViewController];
+  if (state_ != newState || ![[oldViewController view] superview]) {
     state_ = newState;
-    currentView = [[self currentViewController] view];
-    [[self view] addSubview:currentView];
+    [[self view] addSubview:[[self currentViewController] view]];
 
     // Ensure that the close button is topmost.
     [closeButton_ removeFromSuperview];
     [[self view] addSubview:closeButton_];
   }
 
   switch (state_) {
     case PICKER_STATE_WAITING:
       [self updateWaiting];
       break;
     case PICKER_STATE_NO_SERVICE:
       [self updateNoService];
       break;
     case PICKER_STATE_CHOOSE_SERVICE:
       [self updateChooseService];
       break;
     case PICKER_STATE_INLINE_SERVICE:
       [self updateInlineService];
       break;
     case PICKER_STATE_INSTALLING_EXTENSION:
       [self updateInstallingExtension];
       break;
     case PICKER_STATE_EXTENSION_PROMPT:
       [self updateExtensionPrompt];
       break;
   }
 
-  [self performLayout];
+  [self performLayoutWithOldViewController:oldViewController];
 }
 
-- (void)performLayout {
+- (void)performLayoutWithOldViewController:
+    (WebIntentViewController*)oldViewController {
   WebIntentViewController* viewController = [self currentViewController];
   [viewController sizeToFitAndLayout];
   [[viewController view] setFrameOrigin:NSZeroPoint];
 
   NSRect bounds = [[viewController view] bounds];
+  NSWindow* window = [[self view] window];
+  NSRect windowFrame = [window frameRectForContentRect:bounds];
 
   NSRect closeFrame;
   closeFrame.size.width = ConstrainedWindow::GetCloseButtonSize();
   closeFrame.size.height = ConstrainedWindow::GetCloseButtonSize();
   closeFrame.origin.x = NSMaxX(bounds) - NSWidth(closeFrame) -
       ConstrainedWindowConstants::kCloseButtonPadding;
   closeFrame.origin.y = ConstrainedWindowConstants::kCloseButtonPadding;
-  [closeButton_ setFrame:closeFrame];
 
-  [[self view] setFrame:bounds];
+  if (oldViewController) {
+    scoped_nsobject<NSMutableArray> array([[NSMutableArray alloc] init]);
+    if (oldViewController && ![oldViewController isEqual:viewController]) {
+      [array addObject:@{
+          NSViewAnimationTargetKey: [viewController view],
+          NSViewAnimationEffectKey: NSViewAnimationFadeInEffect
+      }];
+      [array addObject:@{
+          NSViewAnimationTargetKey: [oldViewController view],
+          NSViewAnimationEffectKey: NSViewAnimationFadeOutEffect
+      }];
+    }
+    [array addObject:@{
+        NSViewAnimationTargetKey:   window,
+        NSViewAnimationEndFrameKey: [NSValue valueWithRect:windowFrame]
+    }];
+    [array addObject:@{
+        NSViewAnimationTargetKey:   closeButton_,
+        NSViewAnimationEndFrameKey: [NSValue valueWithRect:closeFrame]
+    }];
 
-  NSWindow* window = [[self view] window];
-  [window setFrame:[window frameRectForContentRect:bounds] display:YES];
+    scoped_nsobject<NSViewAnimation> animation(
+        [[NSViewAnimation alloc] initWithViewAnimations:array]);
+    [animation setAnimationBlockingMode:NSAnimationBlocking];
+    [animation setDuration:0.2];
+    [animation startAnimation];
+  } else {
+    [window setFrame:windowFrame display:YES];
+    [[self view] setFrame:bounds];
+    [closeButton_ setFrame:closeFrame];
+  }
+
+  if (oldViewController && ![oldViewController isEqual:viewController]) {
+    [[oldViewController view] removeFromSuperview];
+    [oldViewController viewRemovedFromSuperview];
+  }
 }
 
 - (WebIntentViewController*)currentViewController {
   switch (state_) {
     case PICKER_STATE_WAITING:
       return progressViewController_;
     case PICKER_STATE_NO_SERVICE:
       return messageViewController_;
     case PICKER_STATE_CHOOSE_SERVICE:
       return chooseServiceViewController_;
@@ skipping 181 matching lines @@
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   picker_->delegate()->OnSuggestionsLinkClicked(disposition);
 }
 
 - (void)onChooseAnotherService:(id)sender {
   picker_->delegate()->OnChooseAnotherService();
 }
 
 @end