Index: chrome/browser/ui/views/frame/browser_view.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
index 86eb5995f16525ca4fc8dd59fafc17171f4934ee..ddae1e1c958ca5bad572eb0bda2202bdfcd87d9a 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -831,8 +831,8 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, |
contents_web_view_->SetWebContents(NULL); |
devtools_web_view_->SetWebContents(NULL); |
} |
- infobar_container_->ChangeInfoBarService( |
- InfoBarService::FromWebContents(new_contents)); |
+ infobar_container_->ChangeInfoBarManager( |
+ &InfoBarService::FromWebContents(new_contents)->infobar_manager()); |
blundell
2014/03/27 09:40:30
Do we know the infobar service won't be NULL here?
|
if (old_contents && PermissionBubbleManager::FromWebContents(old_contents)) |
PermissionBubbleManager::FromWebContents(old_contents)->SetView(NULL); |
@@ -1490,7 +1490,7 @@ void BrowserView::TabDetachedAt(WebContents* contents, int index) { |
// freed. This is because the focus manager performs some operations |
// on the selected WebContents when it is removed. |
contents_web_view_->SetWebContents(NULL); |
- infobar_container_->ChangeInfoBarService(NULL); |
+ infobar_container_->ChangeInfoBarManager(NULL); |
UpdateDevToolsForContents(NULL, true); |
} |
} |