Infobar Componentization Proof of Concept

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

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..1a3cd63f865046e2d79ccbdd127098e2d59505e3 100644
--- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm
@@ -9,6 +9,7 @@
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_container.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
@@ -68,12 +69,13 @@
 
 - (void)changeWebContents:(content::WebContents*)contents {
   currentWebContents_ = contents;
+  InfoBarManager* infobar_manager = NULL;
   if (contents) {
-    containerCocoa_->ChangeInfoBarService(
-        InfoBarService::FromWebContents(contents));
-  } else {
-    containerCocoa_->ChangeInfoBarService(NULL);
+    InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
+    if (infobar_service)
+      infobar_manager = &infobar_service->infobar_manager();
   }
+  containerCocoa_->ChangeInfoBarManager(infobar_manager);
 }
 
 - (void)tabDetachedWithContents:(content::WebContents*)contents {