Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: chrome/browser/cocoa/bookmark_menu_bridge.mm

Issue 53116: Fix leaks found by valgrind (which now works on the Mac!)... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/bookmark_menu_bridge.h ('k') | chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/bookmark_menu_bridge.mm
===================================================================
--- chrome/browser/cocoa/bookmark_menu_bridge.mm (revision 12575)
+++ chrome/browser/cocoa/bookmark_menu_bridge.mm (working copy)
@@ -14,12 +14,17 @@
#include "chrome/browser/profile_manager.h"
BookmarkMenuBridge::BookmarkMenuBridge()
- : controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]) {
+ : controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]),
+ observing_(true) {
BrowserList::AddObserver(this);
}
BookmarkMenuBridge::~BookmarkMenuBridge() {
- GetBookmarkModel()->RemoveObserver(this);
+ if (observing_)
+ BrowserList::RemoveObserver(this);
+ BookmarkModel *model = GetBookmarkModel();
+ if (model)
+ model->RemoveObserver(this);
[controller_ release];
}
@@ -98,6 +103,7 @@
// complete.
void BookmarkMenuBridge::OnBrowserSetLastActive(const Browser* browser) {
BrowserList::RemoveObserver(this);
+ observing_ = false;
BookmarkModel* model = GetBookmarkModel();
model->AddObserver(this);
if (model->IsLoaded())
« no previous file with comments | « chrome/browser/cocoa/bookmark_menu_bridge.h ('k') | chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698