diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 12:53:03 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 12:53:03 +0000 |
| commit | c9b0cbdfe3a92f8e7413fb89fa67d25864eebc0f (patch) | |
| tree | d7e8c2f65660051a38b3e4d58b4df0a12ccd174f /chrome/browser/cocoa/toolbar_controller.h | |
| parent | 34ff04759ed15031330cd7006a2003ce4504a49f (diff) | |
| download | chromium_src-c9b0cbdfe3a92f8e7413fb89fa67d25864eebc0f.zip chromium_src-c9b0cbdfe3a92f8e7413fb89fa67d25864eebc0f.tar.gz chromium_src-c9b0cbdfe3a92f8e7413fb89fa67d25864eebc0f.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h index d2cc2c4..4388c15 100644 --- a/chrome/browser/cocoa/toolbar_controller.h +++ b/chrome/browser/cocoa/toolbar_controller.h @@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#include "base/scoped_ptr.h" #import "chrome/browser/cocoa/command_observer_bridge.h" class CommandUpdater; @@ -23,8 +24,8 @@ class ToolbarView; @private ToolbarModel* toolbarModel_; // weak, one per window CommandUpdater* commands_; // weak, one per window - CommandObserverBridge* commandObserver_; - LocationBarViewMac* locationBarView_; + scoped_ptr<CommandObserverBridge> commandObserver_; + scoped_ptr<LocationBarViewMac> locationBarView_; IBOutlet NSButton* backButton_; IBOutlet NSButton* forwardButton_; |