[Mac] Inform reference counted objects that hold a weak Browser* when the Browser is being destroye…

chrome/browser/ui/cocoa/download/download_shelf_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 124 matching lines @@
                         name:kWillEnterFullscreenNotification
                       object:nil];
   [defaultCenter addObserver:self
                     selector:@selector(willLeaveFullscreen)
                         name:kWillLeaveFullscreenNotification
                       object:nil];
   [self installTrackingArea];
 }
 
 - (void)dealloc {
-  [[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.
+  [self browserWillBeDestroyed];
   [super dealloc];
 }
 
+- (void)browserWillBeDestroyed {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+  // We need to explicitly release our download controllers here since they need
+  // to remove themselves as observers before the remaining shutdown happens.
+  [[self animatableView] stopAnimation];

[erikchen, 2015/07/08 18:02:17]

this logic looks copy-pasted from -exiting. Please dedupe.

[Robert Sesek, 2015/07/08 22:15:18]

-editing was removed.

+  [self removeTrackingArea];
+  [self cancelAutoClose];
+  while ([downloadItemControllers_ count] > 0) {
+    [self removeDownload:[downloadItemControllers_ lastObject]
+          isShelfClosing:YES];
+  }
+  downloadItemControllers_.reset();
+
+  bridge_.reset();
+  navigator_ = nullptr;
+}
+
 // Called after the frame's rect has changed; usually when the height is
 // animated.
 - (void)viewFrameDidChange:(NSNotification*)notification {
   // Anchor subviews at the top of |view|, so that it looks like the shelf
   // is sliding out.
   CGFloat newShelfHeight = NSHeight([[self view] frame]);
   if (newShelfHeight == currentShelfHeight_)
     return;
 
   for (NSView* view in [[self view] subviews]) {
@@ skipping 42 matching lines @@
     [self maybeAutoCloseAfterDelay];
   }
 }
 
 - (void)downloadWasOpened:(DownloadItemController*)item_controller {
   // This should only be called on the main thead.
   DCHECK([NSThread isMainThread]);
   [self maybeAutoCloseAfterDelay];
 }
 
-// We need to explicitly release our download controllers here since they need
-// to remove themselves as observers before the remaining shutdown happens.
-- (void)exiting {
-  [[self animatableView] stopAnimation];
-  [self removeTrackingArea];
-  [self cancelAutoClose];
-  while ([downloadItemControllers_ count] > 0) {
-    [self removeDownload:[downloadItemControllers_ lastObject]
-          isShelfClosing:YES];
-  }
-  downloadItemControllers_.reset();
-}
-
 - (void)showDownloadShelf:(BOOL)show
              isUserAction:(BOOL)isUserAction {
   [self cancelAutoClose];
   shouldCloseOnMouseExit_ = NO;
 
   if ([self isVisible] == show)
     return;
 
   if (!show) {
     int numInProgress = 0;
@@ skipping 265 matching lines @@
   }
 
   // Set the tracking off to create a new tracking area for the control.
   // When changing the bounds/frame on a HoverButton, the tracking isn't updated
   // correctly, it needs to be turned off and back on.
   [hoverCloseButton_ setTrackingEnabled:NO];
   [hoverCloseButton_ setFrame:bounds];
   [hoverCloseButton_ setTrackingEnabled:YES];
 }
 @end