Move infobar handling to a tab helper.

chrome/browser/ui/cocoa/infobars/infobar_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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar.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/infobars/infobar_gradient_view.h"
@@ skipping 89 matching lines @@
 
 @synthesize containerController = containerController_;
 @synthesize delegate = delegate_;
 
 - (id)initWithDelegate:(InfoBarDelegate*)delegate
                  owner:(TabContentsWrapper*)owner {
   DCHECK(delegate);
   if ((self = [super initWithNibName:@"InfoBar"
                               bundle:base::mac::MainAppBundle()])) {
     delegate_ = delegate;
     owner_ = owner;

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

Another |owner_| that should probably become an InfoBarTabHelper*.

   }
   return self;
 }
 
 // All infobars have an icon, so we set up the icon in the base class
 // awakeFromNib.
 - (void)awakeFromNib {
   DCHECK(delegate_);
   if (delegate_->GetIcon()) {
     [image_ setImage:*(delegate_->GetIcon())];
@@ skipping 144 matching lines @@
   [label_.get() setHorizontallyResizable:NO];
   [label_.get() setVerticallyResizable:NO];
 }
 
 - (void)removeSelf {
   // TODO(rohitrao): This method can be called even if the infobar has already
   // been removed and |delegate_| is NULL.  Is there a way to rewrite the code
   // so that inner event loops don't cause us to try and remove the infobar
   // twice?  http://crbug.com/54253
   if (owner_)
-    owner_->RemoveInfoBar(delegate_);
+    owner_->infobar_tab_helper()->RemoveInfoBar(delegate_);
   owner_ = NULL;
 }
 
 - (void)cleanUpAfterAnimation:(BOOL)finished {
   // Don't need to do any cleanup if the bar was animating open.
   if (!infoBarClosing_)
     return;
 
   // Notify the delegate that the infobar was closed.  The delegate will delete
   // itself as a result of InfoBarClosed(), so we null out its pointer.
@@ skipping 266 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }