| Index: chrome/browser/app_controller_mac.h
|
| ===================================================================
|
| --- chrome/browser/app_controller_mac.h (revision 14938)
|
| +++ chrome/browser/app_controller_mac.h (working copy)
|
| @@ -7,26 +7,33 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include "base/scoped_nsobject.h"
|
| +#include "base/scoped_ptr.h"
|
| +
|
| class BookmarkMenuBridge;
|
| class CommandUpdater;
|
| +@class PreferencesWindowController;
|
| class Profile;
|
|
|
| // The application controller object, created by loading the MainMenu nib.
|
| // This handles things like responding to menus when there are no windows
|
| // open, etc and acts as the NSApplication delegate.
|
| @interface AppController : NSObject<NSUserInterfaceValidations> {
|
| - @public
|
| - CommandUpdater* menuState_; // strong ref
|
| @private
|
| + scoped_ptr<CommandUpdater> menuState_;
|
| // Management of the bookmark menu which spans across all windows
|
| - // (and Browser*s). This is dynamically allocated to keep objc
|
| - // happy.
|
| - BookmarkMenuBridge* bookmarkMenuBridge_;
|
| + // (and Browser*s).
|
| + scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_;
|
| + scoped_nsobject<PreferencesWindowController> prefsController_;
|
| }
|
|
|
| - (IBAction)quit:(id)sender;
|
| - (Profile*)defaultProfile;
|
|
|
| +// Show the preferences window, or bring it to the front if it's already
|
| +// visible.
|
| +- (IBAction)showPreferences:(id)sender;
|
| +
|
| @end
|
|
|
| #endif
|
|
|