From c9b0cbdfe3a92f8e7413fb89fa67d25864eebc0f Mon Sep 17 00:00:00 2001 From: "pinkerton@chromium.org" Date: Mon, 13 Apr 2009 12:53:03 +0000 Subject: Convert more members to scoped pointers. Move status bubble into browser window controller. Move extra window retain into BWC because it's needed for things in there, not the BrowserWindow impl. Be explicit about the ordering and nature of the ownership in BWC, which should be better since it's now all in one place. Clean up a lot of un-used cruft in tab strip and tab contents now that the toolbaris no longer there, preparing for the BookmarkBar to leave as well. Review URL: http://codereview.chromium.org/66047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13589 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/tab_strip_controller.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome/browser/cocoa/tab_strip_controller.h') diff --git a/chrome/browser/cocoa/tab_strip_controller.h b/chrome/browser/cocoa/tab_strip_controller.h index ab6b902..dae7218 100644 --- a/chrome/browser/cocoa/tab_strip_controller.h +++ b/chrome/browser/cocoa/tab_strip_controller.h @@ -7,6 +7,8 @@ #import +#include "base/scoped_nsobject.h" +#include "base/scoped_ptr.h" #import "chrome/browser/cocoa/tab_controller_target.h" @class TabStripView; @@ -14,7 +16,6 @@ class BookmarkModel; class Browser; -class CommandUpdater; class LocationBar; class TabStripModelObserverBridge; class TabStripModel; @@ -38,21 +39,20 @@ class ToolbarModel; TabStripView* tabView_; // weak NSView* switchView_; // weak NSButton* newTabButton_; // weak, obtained from the nib. - TabStripModelObserverBridge* bridge_; + scoped_ptr bridge_; TabStripModel* tabModel_; // weak BookmarkModel* bookmarkModel_; // weak, one per profile (= one per Browser*) - CommandUpdater* commands_; // weak, may be nil // access to the TabContentsControllers (which own the parent view // for the toolbar and associated tab contents) given an index. This needs // to be kept in the same order as the tab strip's model as we will be // using its index from the TabStripModelObserver calls. - NSMutableArray* tabContentsArray_; + scoped_nsobject tabContentsArray_; // an array of TabControllers which manage the actual tab views. As above, // this is kept in the same order as the tab strip model. - NSMutableArray* tabArray_; + scoped_nsobject tabArray_; // Controller for bookmark bar state, shared among all TabContents. - BookmarkBarStateController* bookmarkBarStateController_; + scoped_nsobject bookmarkBarStateController_; } // Initialize the controller with a view and browser that contains -- cgit v1.1