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..6a63b2f9cd717a3e87b25cf07bdf3f91899085cb 100644 |
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm |
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm |
@@ -573,6 +573,11 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) { |
} |
- (void)dealloc { |
+ [self browserWillBeDestroyed]; |
+ [super dealloc]; |
+} |
+ |
+- (void)browserWillBeDestroyed { |
[tabStripView_ setController:nil]; |
if (trackingArea_.get()) |
@@ -586,7 +591,8 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) { |
[[[view animationForKey:@"frameOrigin"] delegate] invalidate]; |
} |
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
- [super dealloc]; |
+ |
+ browser_ = nullptr; |
} |
+ (CGFloat)defaultTabHeight { |