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

chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 196 matching lines @@
                profile:(Profile*)profile
                browser:(Browser*)browser
         resizeDelegate:(id<ViewResizer>)resizeDelegate
           nibFileNamed:(NSString*)nibName {
   DCHECK(commands && profile && [nibName length]);
   if ((self = [super initWithNibName:nibName
                               bundle:base::mac::FrameworkBundle()])) {
     commands_ = commands;
     profile_ = profile;
     browser_ = browser;
-    resizeDelegate_ = resizeDelegate;
     hasToolbar_ = YES;
     hasLocationBar_ = YES;
 
     // Register for notifications about state changes for the toolbar buttons
     commandObserver_.reset(
         new ToolbarControllerInternal::CommandObserverBridge(self));
 
     commands->AddCommandObserver(IDC_BACK, commandObserver_.get());
     commands->AddCommandObserver(IDC_FORWARD, commandObserver_.get());
     commands->AddCommandObserver(IDC_RELOAD, commandObserver_.get());
     commands->AddCommandObserver(IDC_HOME, commandObserver_.get());
     commands->AddCommandObserver(IDC_BOOKMARK_PAGE, commandObserver_.get());
     // NOTE: Don't remove the command observers. ToolbarController is
     // autoreleased at about the same time as the CommandUpdater (owned by the
     // Browser), so |commands_| may not be valid any more.
   }
   return self;
 }
 
+- (void)browserWillBeDestroyed {
+  // This method indicates imminent destruction. Destroy owned objects that hold
+  // a weak Browser*, or pass this call onto reference counted objects.
+  locationBarView_.reset();

[tapted, 2015/07/06 07:26:18]

e.g. [locationBarView_ setController:nil] might be a more reliable way to remove
references

[jackhou1, 2015/07/07 03:27:27]

locationBarView_ is a C++ object.

+  [backMenuController_ browserWillBeDestroyed];
+  [forwardMenuController_ browserWillBeDestroyed];
+  [browserActionsController_ browserWillBeDestroyed];
+  [wrenchMenuController_ browserWillBeDestroyed];
+
+  browser_ = nullptr;
+}
+
 - (id)initWithCommands:(CommandUpdater*)commands
                profile:(Profile*)profile
                browser:(Browser*)browser
         resizeDelegate:(id<ViewResizer>)resizeDelegate {
   if ((self = [self initWithCommands:commands
                              profile:profile
                              browser:browser
                       resizeDelegate:resizeDelegate
                         nibFileNamed:@"Toolbar"])) {
   }
@@ skipping 665 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end