diff options
| author | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 19:25:50 +0000 |
|---|---|---|
| committer | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 19:25:50 +0000 |
| commit | 811cb260aea2b6edea92e3b900945b55570c75d4 (patch) | |
| tree | a1834f373c9ab4c359010d91931c9a633594d5e1 /chrome/browser | |
| parent | c14117b97d9fee1ec586c92898262900c2079eec (diff) | |
| download | chromium_src-811cb260aea2b6edea92e3b900945b55570c75d4.zip chromium_src-811cb260aea2b6edea92e3b900945b55570c75d4.tar.gz chromium_src-811cb260aea2b6edea92e3b900945b55570c75d4.tar.bz2 | |
Mac bookmark mgr: Fix crash after closing incognito window.
BUG=32594
TEST=none (see steps to reproduce)
Review URL: http://codereview.chromium.org/554034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_manager_controller.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_manager_controller.mm b/chrome/browser/cocoa/bookmark_manager_controller.mm index 3bf7615..ee9a83a 100644 --- a/chrome/browser/cocoa/bookmark_manager_controller.mm +++ b/chrome/browser/cocoa/bookmark_manager_controller.mm @@ -106,7 +106,11 @@ class BookmarkManagerBridge : public BookmarkModelObserver { ofType:@"nib"]; self = [super initWithWindowNibPath:nibPath owner:self]; if (self != nil) { - profile_ = profile; + // Never use an incognito Profile, which can be deleted at any moment when + // the user closes its browser window. Use the default one instead. + DCHECK(profile); + profile_ = profile->GetOriginalProfile(); + bridge_.reset(new BookmarkManagerBridge(self)); profile_->GetBookmarkModel()->AddObserver(bridge_.get()); |