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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_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: Fix ToolbarActionsBar tests. 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/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index d949d4146b32eec822c0e72fb7f90f8ee17ec261..7e436d49dca7868a0467f411948803e802fab01b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -572,7 +572,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
return self;
}
-- (void)dealloc {
+- (void)browserWillBeDestroyed {
[tabStripView_ setController:nil];
if (trackingArea_.get())
@@ -586,7 +586,8 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
[[[view animationForKey:@"frameOrigin"] delegate] invalidate];
}
[[NSNotificationCenter defaultCenter] removeObserver:self];
- [super dealloc];
+
+ browser_ = nullptr;
}
+ (CGFloat)defaultTabHeight {

Powered by Google App Engine
This is Rietveld 408576698