Fixes up bookmark bubbles and the browser window so that they shut down corre...

chrome/browser/cocoa/browser_window_controller.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
@@ skipping 32 matching lines @@
 @interface BrowserWindowController :
   TabWindowController<NSUserInterfaceValidations,
                       BookmarkURLOpener,
                       BookmarkBubbleControllerDelegate,
                       ViewResizer,
                       GTMThemeDelegate> {
  @private
   // The ordering of these members is important as it determines the order in
   // which they are destroyed. |browser_| needs to be destroyed last as most of
   // the other objects hold weak references to it or things it owns
-  // (tab/toolbar/bookmark models, profiles, etc). We hold a strong ref to the
-  // window so that it will live after the NSWindowController dealloc has run
-  // (which happens *before* these scoped pointers are torn down). Keeping it
-  // alive ensures that weak view or window pointers remain valid through
-  // their destruction sequence.
+  // (tab/toolbar/bookmark models, profiles, etc).
   scoped_ptr<Browser> browser_;
-  scoped_nsobject<ChromeBrowserWindow> window_;
-  scoped_nsobject<NSWindow> fullscreen_window_;
+  NSWindow* savedRegularWindow_;
   scoped_ptr<TabStripModelObserverBridge> tabObserver_;
   scoped_ptr<BrowserWindowCocoa> windowShim_;
   scoped_nsobject<ToolbarController> toolbarController_;
   scoped_nsobject<TitlebarController> titlebarController_;
   scoped_nsobject<TabStripController> tabStripController_;
   scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
   scoped_nsobject<InfoBarContainerController> infoBarContainerController_;
-  scoped_ptr<StatusBubbleMac> statusBubble_;
   scoped_nsobject<DownloadShelfController> downloadShelfController_;
   scoped_nsobject<ExtensionShelfController> extensionShelfController_;
   scoped_nsobject<BookmarkBarController> bookmarkBarController_;
-  scoped_nsobject<BookmarkBubbleController> bookmarkBubbleController_;
+
+  // Strong. StatusBubble is a special case of a strong reference that
+  // we don't wrap in a scoped_ptr because it is acting the same
+  // as an NSWindowController in that it wraps a window that must
+  // be shut down before our destructors are called.
+  StatusBubbleMac* statusBubble_;
+
+  // Strong. We don't wrap it in scoped_nsobject because we must close
+  // it appropriately in [windowWillClose:].
+  BookmarkBubbleController* bookmarkBubbleController_;
   scoped_nsobject<GTMTheme> theme_;
   BOOL ownsBrowser_;  // Only ever NO when testing
-  BOOL fullscreen_;
   CGFloat verticalOffsetForStatusBubble_;
 }
 
 // Load the browser window nib and do any Cocoa-specific initialization.
 // Takes ownership of |browser|.
 - (id)initWithBrowser:(Browser*)browser;
 
 // Call to make the browser go away from other places in the cross-platform
 // code.
 - (void)destroyBrowser;
@@ skipping 90 matching lines @@
 
 // Return an autoreleased NSWindow suitable for fullscreen use.
 - (NSWindow*)fullscreenWindow;
 
 // Return a point suitable for the topLeft for a bookmark bubble.
 - (NSPoint)topLeftForBubble;
 
 @end  // BrowserWindowController(TestingAPI)
 
 #endif  // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_