Force c++ dtors to get called in objc interfaces (it was always on since gcc4...

chrome/browser/cocoa/browser_window_controller.mm

 // 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.
 
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 @interface BrowserWindowController(Private)
 - (void)positionToolbar;
 @end
 
 @implementation BrowserWindowController
 
 // Load the browser window nib and do any Cocoa-specific initialization.
 // Takes ownership of |browser|. Note that the nib also sets this controller
 // up as the window's delegate.
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithWindowNibName:@"BrowserWindow"])) {
-    browser_ = browser;
-    DCHECK(browser_);
-    tabObserver_ = new TabStripModelObserverBridge(browser->tabstrip_model(),
-                                                   self);
-    windowShim_ = new BrowserWindowCocoa(browser, self, [self window]);
+    browser_.reset(browser);
+    DCHECK(browser_.get());

[Mark Mentovai, 2009/04/10 15:23:29]

Eliminate a .get() if you DCHCEK on browser instead of the _ version (probably
before doing the reset).

+    tabObserver_.reset(
+        new TabStripModelObserverBridge(browser->tabstrip_model(), self));
+    windowShim_.reset(new BrowserWindowCocoa(browser, self, [self window]));
 
     // The window is now fully realized and |-windowDidLoad:| has been
     // called. We shouldn't do much in wDL because |windowShim_| won't yet
     // be initialized (as it's called in response to |[self window]| above).
 
     // Get the most appropriate size for the window. The window shim will handle
     // flipping the coordinates for us so we can use it to save some code.
     gfx::Rect windowRect = browser_->GetSavedWindowBounds();
     windowShim_->SetBounds(windowRect);
 
     // Create a controller for the tab strip, giving it the model object for
     // this window's Browser and the tab strip view. The controller will handle
     // registering for the appropriate tab notifications from the back-end and
     // managing the creation of new tabs.
-    tabStripController_ = [[TabStripController alloc]
-                            initWithView:[self tabStripView]
-                              switchView:[self tabContentArea]
-                                 browser:browser_];
+    tabStripController_.reset([[TabStripController alloc]
+                                initWithView:[self tabStripView]
+                                  switchView:[self tabContentArea]
+                                     browser:browser_.get()]);
 
     // Create a controller for the toolbar, giving it the toolbar model object
     // and the toolbar view from the nib. The controller will handle
     // registering for the appropriate command state changes from the back-end.
-    toolbarController_ = [[ToolbarController alloc]
-                            initWithModel:browser->toolbar_model()
-                                 commands:browser->command_updater()];
+    toolbarController_.reset([[ToolbarController alloc]
+                               initWithModel:browser->toolbar_model()
+                                    commands:browser->command_updater()]);
     [self positionToolbar];
   }
   return self;
 }
 
 - (void)dealloc {
   browser_->CloseAllTabs();
-  [tabStripController_ release];
-  [toolbarController_ release];
-  delete windowShim_;
-  delete tabObserver_;
-  delete browser_;
   [super dealloc];
 }
 
 // Access the C++ bridge between the NSWindow and the rest of Chromium
 - (BrowserWindow*)browserWindow {
-  return windowShim_;
+  return windowShim_.get();
 }
 
 // Position |toolbarView_| below the tab strip, but not as a sibling. The
 // toolbar is part of the window's contentView, mainly because we want the
 // opacity during drags to be the same as the web content.
 - (void)positionToolbar {
   NSView* contentView = [self tabContentArea];
   NSRect contentFrame = [contentView frame];
   NSView* toolbarView = [toolbarController_ view];
   NSRect toolbarFrame = [toolbarView frame];
@@ skipping 52 matching lines @@
     browser_->OnWindowClosing();
     return NO;
   }
 
   // the tab strip is empty, it's ok to close the window
   return YES;
 }
 
 // Called right after our window became the main window.
 - (void)windowDidBecomeMain:(NSNotification *)notification {
-  BrowserList::SetLastActive(browser_);
+  BrowserList::SetLastActive(browser_.get());
 }
 
 // Update a toggle state for an NSMenuItem if modified.
 // Take care to insure |item| looks like a NSMenuItem.
 // Called by validateUserInterfaceItem:.
 - (void)updateToggleStateWithTag:(NSInteger)tag forItem:(id)item {
   if (![item respondsToSelector:@selector(state)] ||
       ![item respondsToSelector:@selector(setState:)])
     return;
 
@@ skipping 184 matching lines @@
 // TODO(pinkerton):Update as more things become window-specific
   // Update all the UI bits.
   UpdateTitleBar();
   toolbar_->SetProfile(new_contents->profile());
   UpdateToolbar(new_contents, true);
   UpdateUIForContents(new_contents);
 #endif
 }
 
 @end