| Index: chrome/browser/app_controller_mac.h
|
| diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
|
| index cea9bfd599cc5b960b2aeb2989f5680ce5b7d844..d5e2b7002d44d55316c28360d3b36ec1cbb00f80 100644
|
| --- a/chrome/browser/app_controller_mac.h
|
| +++ b/chrome/browser/app_controller_mac.h
|
| @@ -14,8 +14,10 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/prefs/pref_change_registrar.h"
|
| +#include "chrome/browser/app_controller_profile_observer.h"
|
| #include "ui/base/work_area_watcher_observer.h"
|
|
|
| +class AppControllerProfileObserver;
|
| class BookmarkMenuBridge;
|
| class CommandUpdater;
|
| class GURL;
|
| @@ -39,6 +41,10 @@ class WorkAreaWatcherObserver;
|
| // build the user-data specific main menu items.
|
| Profile* lastProfile_;
|
|
|
| + // The ProfileObserver observes the ProfileInfoCache and gets notified
|
| + // when a profile has been deleted.
|
| + AppControllerProfileObserver* profileInfoCacheObserver_;
|
| +
|
| // Management of the bookmark menu which spans across all windows
|
| // (and Browser*s).
|
| scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_;
|
| @@ -101,7 +107,7 @@ class WorkAreaWatcherObserver;
|
| - (IBAction)showPreferences:(id)sender;
|
|
|
| // Redirect in the menu item from the expected target of "File's
|
| -// Owner" (NSAppliation) for a Branded About Box
|
| +// Owner" (NSApplication) for a Branded About Box
|
| - (IBAction)orderFrontStandardAboutPanel:(id)sender;
|
|
|
| // Toggles the "Confirm to Quit" preference.
|
| @@ -122,6 +128,10 @@ class WorkAreaWatcherObserver;
|
| - (void)addObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer;
|
| - (void)removeObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer;
|
|
|
| +// If the last used profile was removed we need to NULL it out
|
| +// so that it can be recreated correctly when the next browser window is open
|
| +- (void)profileWasRemoved:(const string16&)profileName;
|
| +
|
| @end
|
|
|
| #endif // __OBJC__
|
|
|