Restoring a session should restore window minimization state

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 26 matching lines @@
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
+// Provide the forward-declarations of new 10.7 SDK symbols so they can be

[Mark Mentovai, 2011/08/19 19:17:27]

People keep copying and pasting this comment, but it’s wrong.

1. There isn’t anything forward about these declarations.

2. You’re not really working with symbols, just say “things.” enums don’t have
symbols.

[dhollowa, 2011/08/19 20:38:16]

Done.  And I've fixed it in the other copy/paste sites as well.

On 2011/08/19 19:17:27, Mark Mentovai wrote:

+// called when building with the 10.5 SDK.
+#if !defined(MAC_OS_X_VERSION_10_7) || \
+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+
+enum {
+  NSWindowAnimationBehaviorDefault = 0,
+  NSWindowAnimationBehaviorNone = 2,
+  NSWindowAnimationBehaviorDocumentWindow = 3,
+  NSWindowAnimationBehaviorUtilityWindow = 4,
+  NSWindowAnimationBehaviorAlertPanel = 5
+};
+typedef NSInteger NSWindowAnimationBehavior;
+
+@interface NSWindow (LionSDKDeclarations)
+- (NSWindowAnimationBehavior)animationBehavior;
+- (void)setAnimationBehavior:(NSWindowAnimationBehavior)newAnimationBehavior;
+@end
+
+#endif  // MAC_OS_X_VERSION_10_7
+
 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
-                                       BrowserWindowController* controller,
-                                       NSWindow* window)
+                                       BrowserWindowController* controller)
   : browser_(browser),
     controller_(controller),
     confirm_close_factory_(browser) {
   // Listen for bookmark bar visibility changes and set the initial state; we
   // need to listen to all profiles because of normal profile/incognito issues.
   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() {
   // 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_);
 
-  [window() makeKeyAndOrderFront:controller_];
+  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.

[Mark Mentovai, 2011/08/19 19:17:27]

Glad you figured this out.

[dhollowa, 2011/08/19 20:38:16]

Me too!

On 2011/08/19 19:17:27, Mark Mentovai wrote:

+    NSWindowAnimationBehavior savedAnimationBehavior = 0;
+    if ([window() respondsToSelector:@selector(animationBehavior)] &&
+        [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
+      savedAnimationBehavior = [window() animationBehavior];
+      [window() setAnimationBehavior:NSWindowAnimationBehaviorNone];
+    }
+
+    [window() makeKeyAndOrderFront:controller_];
+
+    [window() orderOut:controller_];
+    [window() miniaturize:controller_];
+
+    // Restore window animation behavior.
+    if ([window() respondsToSelector:@selector(animationBehavior)] &&
+        [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
+      [window() setAnimationBehavior:savedAnimationBehavior];
+    }
+  } else {
+    [window() makeKeyAndOrderFront:controller_];
+  }
 }
 
 void BrowserWindowCocoa::ShowInactive() {
-    [window() orderFront:controller_];
+  [window() orderFront:controller_];
 }
 
 void BrowserWindowCocoa::SetBounds(const gfx::Rect& bounds) {
   gfx::Rect real_bounds = [controller_ enforceMinWindowSize:bounds];
 
   SetFullscreen(false);
   NSRect cocoa_bounds = NSMakeRect(real_bounds.x(), 0,
                                    real_bounds.width(),
                                    real_bounds.height());
   // Flip coordinates based on the primary screen.
@@ skipping 116 matching lines @@
 }
 
 gfx::Rect BrowserWindowCocoa::GetBounds() const {
   return GetRestoredBounds();
 }
 
 bool BrowserWindowCocoa::IsMaximized() const {
   return [window() isZoomed];
 }
 
+bool BrowserWindowCocoa::IsMinimized() const {
+  return [window() isMiniaturized];
+}
+
 void BrowserWindowCocoa::SetFullscreen(bool fullscreen) {
   [controller_ setFullscreen:fullscreen];
 }
 
 bool BrowserWindowCocoa::IsFullscreen() const {
   return !![controller_ isFullscreen];
 }
 
 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const {
   return false;
@@ skipping 406 matching lines @@
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
   if (tab_contents == browser_->GetSelectedTabContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }