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 66 matching lines @@
   registrar_.Add(this,
                  chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
                  NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, chrome::NOTIFICATION_SIDEBAR_CHANGED,
                  Source<SidebarManager>(SidebarManager::GetInstance()));
 }
 
 BrowserWindowCocoa::~BrowserWindowCocoa() {
 }
 
-void BrowserWindowCocoa::Show() {
+void BrowserWindowCocoa::Show(BrowserWindow::ShowContext show_context) {
   // 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;
+  NSWindowAnimationBehavior savedAnimationBehavior = 0;

[Mark Mentovai, 2011/08/31 16:20:49]

Style nit: you’re supposed to use saved_animation_behavior here because you’re
not in an Objective-C @protocol or @interface or @implementation.

[dhollowa, 2011/08/31 17:05:11]

Done.

+  if (show_context == BrowserWindow::SHOW_CONTEXT_RESTORE) {
+    // Turn off swishing when restoring windows.
     if ([window() respondsToSelector:@selector(animationBehavior)] &&

[Mark Mentovai, 2011/08/31 16:20:49]

Fold these conditions into the same |if| that encloses them.

[dhollowa, 2011/08/31 17:05:11]

Done.

         [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
       savedAnimationBehavior = [window() animationBehavior];
       [window() setAnimationBehavior:NSWindowAnimationBehaviorNone];
     }
+  }
 
-    [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 (show_context == BrowserWindow::SHOW_CONTEXT_RESTORE) {
     // Restore window animation behavior.
     if ([window() respondsToSelector:@selector(animationBehavior)] &&

[Mark Mentovai, 2011/08/31 16:20:49]

Rather than doing this check, and maybe the one that encloses it, twice, come up
with a way to only have to do it once. Doing this kind of work twice is likely
to get out of sync.

Suggestion: add another bool (alongside saved_animation_behavior) initialized to
false, and only set it to true if you set saved_animation_behavior. Use that
bool to determine whether you’ll enter this “restore” block.

[dhollowa, 2011/08/31 17:05:11]

Done.  Nice, yes.  And I've done the same in drag-controller code which did
something similar.

         [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
       [window() setAnimationBehavior:savedAnimationBehavior];
     }
-  } else {
-    [window() makeKeyAndOrderFront:controller_];
   }
 }
 
 void BrowserWindowCocoa::ShowInactive() {
   [window() orderFront:controller_];
 }
 
 void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds) {
   gfx::Rect real_bounds = [controller_ enforceMinWindowSize:bounds];
 
@@ skipping 448 matching lines @@
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
   if (tab_contents == browser_->GetSelectedTabContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }