Infobar Componentization Proof of Concept

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #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"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 
 @interface InfoBarContainerController ()
 // Removes |controller| from the list of controllers in this container and
@@ skipping 39 matching lines @@
 }
 
 - (CGFloat)infobarArrowX {
   LocationBarViewMac* locationBar =
       [[self browserWindowController] locationBarBridge];
   return locationBar->GetPageInfoBubblePoint().x;
 }
 
 - (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 {
   if (currentWebContents_ == contents)
     [self changeWebContents:NULL];
 }
 
 - (CGFloat)overlappingTipHeight {
   return containerCocoa_->GetVerticalOverlap(NULL);
 }
@@ skipping 70 matching lines @@
 
   // This code can be executed while InfoBarController is still on the stack, so
   // we retain and autorelease the controller to prevent it from being
   // dealloc'ed too early.
   [[controller retain] autorelease];
   [[controller view] removeFromSuperview];
   [infobarControllers_ removeObject:controller];
 }
 
 @end