diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 21:52:16 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 21:52:16 +0000 |
| commit | d4e186524ef4db7f227c57dd61ef727c5eaac623 (patch) | |
| tree | 7bf4bc7a25f60c3de9f03f917907fdb151735a81 /chrome/browser/app_controller_mac.h | |
| parent | 2d9c6094d497fac4714ff79205de870c3b6ccaa1 (diff) | |
| download | chromium_src-d4e186524ef4db7f227c57dd61ef727c5eaac623.zip chromium_src-d4e186524ef4db7f227c57dd61ef727c5eaac623.tar.gz chromium_src-d4e186524ef4db7f227c57dd61ef727c5eaac623.tar.bz2 | |
Moved a whole pile of unittests over to CocoaTest.
AboutIPC.xib - Connected up controller to its window and the window delegate to the controller.
BUG=26484, 26484
TEST=See repro steps in bugs.
Review URL: http://codereview.chromium.org/402066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.h')
| -rw-r--r-- | chrome/browser/app_controller_mac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h index 30f7b3c..44af869a 100644 --- a/chrome/browser/app_controller_mac.h +++ b/chrome/browser/app_controller_mac.h @@ -30,8 +30,8 @@ class Profile; // (and Browser*s). scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; scoped_ptr<HistoryMenuBridge> historyMenuBridge_; - scoped_nsobject<PreferencesWindowController> prefsController_; - scoped_nsobject<AboutWindowController> aboutController_; + PreferencesWindowController* prefsController_; // Weak. + AboutWindowController* aboutController_; // Weak. // URLs that need to be opened when the app is fully initialized. Because it's // only needed during early startup, it points to a valid vector during early |