chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm - Issue 211273007: Split InfoBarService core code into InfoBarManager

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/infobars/infobar_container_controller.mm

Issue 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase + comments Created 6 years, 9 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:

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

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

index 3c8e71cc3902c653e9f06e9b3aaf0fc917609d9e..f33638c44ee604ff395e1fad1dd76bc7075b294a 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

@@ -68,12 +68,10 @@

- (void)changeWebContents:(content::WebContents*)contents {

currentWebContents_ = contents;

- if (contents) {

- containerCocoa_->ChangeInfoBarService(

- InfoBarService::FromWebContents(contents));

- } else {

- containerCocoa_->ChangeInfoBarService(NULL);

- }

+ InfoBarManager* infobar_manager = NULL;

+ if (contents)

+ infobar_manager = InfoBarService::InfoBarManagerFromWebContents(contents);

+ containerCocoa_->ChangeInfoBarManager(infobar_manager);

}

- (void)tabDetachedWithContents:(content::WebContents*)contents {