Index: chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
index ebebb03f18c96560117ed7c28b07ca535c560912..5026bcb6452e38cf19a6035512dad6ef18b2dd5e 100644 |
--- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
+++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
@@ -141,14 +141,11 @@ const NSSize kHoverCloseButtonDefaultSize = { 18, 18 }; |
[self installTrackingArea]; |
} |
-- (void)dealloc { |
+- (void)browserWillBeDestroyed { |
[[NSNotificationCenter defaultCenter] removeObserver:self]; |
- [self cancelAutoClose]; |
- [self removeTrackingArea]; |
- |
- // The controllers will unregister themselves as observers when they are |
- // deallocated. No need to do that here. |
- [super dealloc]; |
+ [self exiting]; |
tapted
2015/07/07 04:25:59
I think you can just move the contents of `exiting
jackhou1
2015/07/07 08:33:05
Done.
|
+ bridge_.reset(); |
+ navigator_ = nullptr; |
} |
// Called after the frame's rect has changed; usually when the height is |