chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 2028823003: Mac: Make ScopedTypeRef require explicit constructors

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 2028823003: Mac: Make ScopedTypeRef require explicit constructors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove dependency Created 4 years, 6 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

« no previous file with comments | « chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm ('k') | chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h » ('j') | no next file with comments »
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 880beebf1528c9f9e06a62e8c2b61098dacbe7bd..7fd1beb3d387d2208f3c6239b1250f1a806c8472 100644

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

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

@@ -495,8 +495,8 @@ - (void)redraw {

- (void)removeViewForAction:(ToolbarActionViewController*)action {

// We're about to remove the button view from the container as well as from

// |buttons_|, so make sure we retain a reference.

- base::scoped_nsobject<BrowserActionButton> button =

- [[self buttonForId:action->GetId()] retain];

+ base::scoped_nsobject<BrowserActionButton> button(

+ [[self buttonForId:action->GetId()] retain]);

// Note: We remove the button from the view and the buttons list first because

// destroying it (or calling -onRemoved) can cause redraws, and we don't want