Move infobar handling to a tab helper.

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.
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/infobar.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
@@ skipping 115 matching lines @@
     return nil;
   return controller;
 }
 
 - (void)changeTabContents:(TabContentsWrapper*)contents {
   registrar_.RemoveAll();
   [self removeAllInfoBars];
 
   currentTabContents_ = contents;
   if (currentTabContents_) {
-    for (size_t i = 0; i < currentTabContents_->infobar_count(); ++i) {
-      InfoBar* infobar = currentTabContents_->GetInfoBarDelegateAt(i)->
-          CreateInfoBar(currentTabContents_);
+    for (size_t i = 0;
+         i < currentTabContents_->infobar_tab_helper()->infobar_count();

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Factor this infobar_tab_helper() out to a temp

+         ++i) {
+      InfoBar* infobar = currentTabContents_->infobar_tab_helper()->
+          GetInfoBarDelegateAt(i)->CreateInfoBar(currentTabContents_);
       [self addInfoBar:infobar animate:NO];
     }
 
     Source<TabContentsWrapper> source(currentTabContents_);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, source);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, source);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED, source);
@@ skipping 105 matching lines @@
     frame.size.width = NSWidth(containerBounds);
     [view setFrame:frame];
 
     minY += NSHeight(frame) - infobars::kTipHeight;
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end