Remove Animation When "Resuming" Window in Lion

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
@@ skipping 74 matching lines @@
 
 void BrowserWindowCocoa::Show() {
   // The Browser associated with this browser window must become the active
   // browser at the time |Show()| is called. This is the natural behaviour under
   // Windows, but |-makeKeyAndOrderFront:| won't send |-windowDidBecomeMain:|
   // until we return to the runloop. Therefore any calls to
   // |BrowserList::GetLastActive()| (for example, in bookmark_util), will return
   // the previous browser instead if we don't explicitly set it here.
   BrowserList::SetLastActive(browser_);
 
-  ui::WindowShowState show_state = browser_->GetSavedWindowShowState();
-  if (show_state == ui::SHOW_STATE_MINIMIZED) {
-    // Turn off swishing when restoring minimized windows.  When creating
-    // windows from nibs it is necessary to |orderFront:| prior to |orderOut:|
-    // then |miniaturize:| when restoring windows in the minimized state.
-    NSWindowAnimationBehavior savedAnimationBehavior = 0;
-    if ([window() respondsToSelector:@selector(animationBehavior)] &&
-        [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
-      savedAnimationBehavior = [window() animationBehavior];
-      [window() setAnimationBehavior:NSWindowAnimationBehaviorNone];
-    }
+  bool is_session_restore = browser_->is_session_restore();
+  NSWindowAnimationBehavior saved_animation_behavior = 0;

[Mark Mentovai, 2011/08/31 17:58:54]

This no longer needs to be initialized to 0, since it’ll only be used if
did_save_animation_behavior is true, and in that case it will always have been
set.

[dhollowa, 2011/08/31 18:40:55]

Done.

+  bool did_save_animation_behavior = false;
+  // Turn off swishing when restoring windows.
+  if (is_session_restore &&
+      [window() respondsToSelector:@selector(animationBehavior)] &&
+      [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
+    saved_animation_behavior = [window() animationBehavior];
+    [window() setAnimationBehavior:NSWindowAnimationBehaviorNone];
+    did_save_animation_behavior = true;

[Mark Mentovai, 2011/08/31 17:58:54]

I would do this before changing the value, just because it flows better
conceptually.

[dhollowa, 2011/08/31 18:40:55]

Done.

+  }
 
-    [window() makeKeyAndOrderFront:controller_];
+  [window() makeKeyAndOrderFront:controller_];
 
+  // When creating windows from nibs it is necessary to |makeKeyAndOrderFront:|
+  // prior to |orderOut:| then |miniaturize:| when restoring windows in the
+  // minimized state.
+  if (browser_->GetSavedWindowShowState() == ui::SHOW_STATE_MINIMIZED) {
     [window() orderOut:controller_];
     [window() miniaturize:controller_];
+  }
 
+  if (did_save_animation_behavior) {
     // Restore window animation behavior.
-    if ([window() respondsToSelector:@selector(animationBehavior)] &&
-        [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
-      [window() setAnimationBehavior:savedAnimationBehavior];
-    }
-  } else {
-    [window() makeKeyAndOrderFront:controller_];
+    [window() setAnimationBehavior:saved_animation_behavior];
   }
+
+  // Once the window has been shown, clear the session restore flag.
+  browser_->set_is_session_restore(false);

[Mark Mentovai, 2011/08/31 17:58:54]

This is the only platform on which this happens, right?

Not so sure about that. Is there a more cross-platformy place to do this?

The parameterized form worked better for this aspect, I think.

[dhollowa, 2011/08/31 18:40:55]

Yes, this is Mac-only logic.  I agree though, this should be paired with the
setter in session_restore.cc.  I've done that.

For the record, I wrote it this way originally to match the usage pattern of
show_state_.  I agree the parameterized version is cleaner in this regard, it
just comes at such a high cost to other callers and sub-classers.  Also,
thinking about future work with Fullscreen, I can imagine needing this state
outside of |Show|.

 }
 
 void BrowserWindowCocoa::ShowInactive() {
   [window() orderFront:controller_];
 }
 
 void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds) {
   gfx::Rect real_bounds = [controller_ enforceMinWindowSize:bounds];
 
   SetFullscreen(false);
@@ skipping 447 matching lines @@
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
   if (tab_contents == browser_->GetSelectedTabContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }