diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 16:01:52 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 16:01:52 +0000 |
| commit | 3111f08b397248f8c0e6e1e8773c53bdf141cabd (patch) | |
| tree | e2dd959be6512682ef659bcccdb9f9a1dabe8f32 /chrome/browser/app_controller_mac.mm | |
| parent | 791cf694a044560c45f8df64ada77a79caa47503 (diff) | |
| download | chromium_src-3111f08b397248f8c0e6e1e8773c53bdf141cabd.zip chromium_src-3111f08b397248f8c0e6e1e8773c53bdf141cabd.tar.gz chromium_src-3111f08b397248f8c0e6e1e8773c53bdf141cabd.tar.bz2 | |
Initial prefs window xib from Cole. Hook the menu up to (empty) code. Use scoped pointers to manage memory.
Review URL: http://codereview.chromium.org/100206
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 5b804ba..2992289 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -30,7 +30,7 @@ - (void)awakeFromNib { // Set up the command updater for when there are no windows open [self initMenuState]; - bookmarkMenuBridge_ = new BookmarkMenuBridge(); + bookmarkMenuBridge_.reset(new BookmarkMenuBridge()); } - (void)applicationDidFinishLaunching:(NSNotification*)notify { @@ -56,8 +56,6 @@ } - (void)dealloc { - delete bookmarkMenuBridge_; - delete menuState_; [super dealloc]; } @@ -110,6 +108,8 @@ enable = menuState_->IsCommandEnabled(tag) ? YES : NO; } else if (action == @selector(quit:)) { enable = YES; + } else if (action == @selector(showPreferences:)) { + enable = YES; } return enable; } @@ -156,7 +156,7 @@ } - (void)initMenuState { - menuState_ = new CommandUpdater(NULL); + menuState_.reset(new CommandUpdater(NULL)); menuState_->UpdateCommandEnabled(IDC_NEW_WINDOW, true); menuState_->UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true); menuState_->UpdateCommandEnabled(IDC_OPEN_FILE, true); @@ -231,4 +231,10 @@ void OpenURLs(const std::vector<GURL>& urls) { OpenURLs(gurlVector); } +// Show the preferences window, or bring it to the front if it's already +// visible. +- (IBAction)showPreferences:(id)sender { +// TODO(pinkerton): more goes here... +} + @end |