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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 1221173003: [Mac] Inform reference counted objects that hold a weak Browser* when the Browser is being destroye… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add HasWeakBrowserPointer protocol. Allow -dealloc without preceding -browserWillBeDestroyed. Created 5 years, 5 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
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index f06bf77cb6adc2bdd345eb1e516ee3c6c8df4642..82e31468db9e130416a186569d313ad83a79dc0e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -350,6 +350,11 @@ void RecordAppLaunch(Profile* profile, GURL url) {
}
- (void)dealloc {
+ [self browserWillBeDestroyed];
+ [super dealloc];
+}
+
+- (void)browserWillBeDestroyed {
// Clear delegate so it doesn't get called during stopAnimation.
[[self animatableView] setResizeDelegate:nil];
@@ -375,7 +380,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
bridge_.reset(NULL);
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self watchForExitEvent:NO];
- [super dealloc];
+ browser_ = nullptr;
}
- (void)awakeFromNib {

Powered by Google App Engine
This is Rietveld 408576698