Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: chrome/browser/cocoa/browser_window_controller.h

Issue 70001: Force c++ dtors to get called in objc interfaces (it was always on since gcc4... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/browser_window_controller.h
===================================================================
--- chrome/browser/cocoa/browser_window_controller.h (revision 13455)
+++ chrome/browser/cocoa/browser_window_controller.h (working copy)
@@ -6,10 +6,14 @@
#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.
+// interactions between Cocoa and the cross-platform code. Each window has a
+// single set of toolbars (main toolbar, bookmark bar, etc) and, by virtue of
+// being a TabWindowController, a tab strip along the top.
#import <Cocoa/Cocoa.h>
+#include "base/scoped_nsobject.h"
+#include "base/scoped_ptr.h"
#import "chrome/browser/cocoa/tab_window_controller.h"
#import "chrome/browser/cocoa/toolbar_view.h"
@@ -27,11 +31,11 @@
@interface BrowserWindowController :
TabWindowController<NSUserInterfaceValidations> {
@private
- TabStripController* tabStripController_;
- ToolbarController* toolbarController_;
- Browser* browser_;
- TabStripModelObserverBridge* tabObserver_;
- BrowserWindowCocoa* windowShim_;
+ scoped_nsobject<TabStripController> tabStripController_;
+ scoped_nsobject<ToolbarController> toolbarController_;
+ scoped_ptr<Browser> browser_;
+ scoped_ptr<TabStripModelObserverBridge> tabObserver_;
+ scoped_ptr<BrowserWindowCocoa> windowShim_;
}
// Load the browser window nib and do any Cocoa-specific initialization.

Powered by Google App Engine
This is Rietveld 408576698