chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 1221173003: [Mac] Inform reference counted objects that hold a weak Browser* when the Browser is being destroye…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_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

« chrome/browser/ui/cocoa/download/download_shelf_controller.mm ('K') | « chrome/browser/ui/cocoa/extensions/browser_actions_controller.h ('k') | chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h » ('j') | chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

index c899d04d9aafa5ba44b534c5867730a158751f6f..e097031145ca221f15eeb3ae0597de831d68b54e 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

@@ -393,7 +393,8 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(

return self;

}

-- (void)dealloc {

+- (void)browserWillBeDestroyed {

+ [overflowMenu_ setDelegate:nil];

// Explicitly destroy the ToolbarActionsBar so all buttons get removed with a

// valid BrowserActionsController, and so we can verify state before

// destruction.

@@ -401,7 +402,7 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(

toolbarActionsBar_.reset();

DCHECK_EQ(0u, [buttons_ count]);

[[NSNotificationCenter defaultCenter] removeObserver:self];

- [super dealloc];

+ browser_ = nullptr;

}

- (void)update {