trunk/src/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm - Issue 102163002: Revert 238283 "Infobar system refactor."

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: trunk/src/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

Issue 102163002: Revert 238283 "Infobar system refactor." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: trunk/src/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

===================================================================

--- trunk/src/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm (revision 238401)

+++ trunk/src/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm (working copy)

@@ -6,6 +6,7 @@

#include "base/logging.h"

#include "base/mac/mac_util.h"

+#include "base/message_loop/message_loop.h"

#include "chrome/browser/infobars/confirm_infobar_delegate.h"

#include "chrome/browser/infobars/infobar.h"

#include "chrome/browser/infobars/infobar_container.h"

@@ -99,8 +100,11 @@

}

- (void)removeInfoBar:(InfoBarCocoa*)infobar {

- [infobar->controller() infobarWillHide];

- [self removeController:infobar->controller()];

+ InfoBarController* controller = infobar->controller();

+ [controller infobarWillClose];

+ infobar->set_controller(nil);

+ [self removeController:controller];

+ base::MessageLoop::current()->DeleteSoon(FROM_HERE, infobar);

}

- (void)positionInfoBarsAndRedraw:(BOOL)isAnimating {