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 c91590da652bb757ee0ef4e38ff42f0d47480ba3..ecfaad70a89cd723d12ef7d9faae389e2c98f316 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -827,8 +827,10 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, |
contents_web_view_->SetWebContents(NULL); |
devtools_web_view_->SetWebContents(NULL); |
} |
- infobar_container_->ChangeInfoBarService( |
- InfoBarService::FromWebContents(new_contents)); |
+ InfoBarService* infobar_service = |
+ InfoBarService::FromWebContents(new_contents); |
+ infobar_container_->ChangeInfoBarManager( |
+ infobar_service ? &infobar_service->infobar_manager() : NULL); |
if (old_contents && PermissionBubbleManager::FromWebContents(old_contents)) |
PermissionBubbleManager::FromWebContents(old_contents)->SetView(NULL); |
@@ -1469,7 +1471,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); |
} |
} |