Move infobar handling to a tab helper.

chrome/browser/tab_contents/infobar.cc

 // 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 "chrome/browser/tab_contents/infobar.h"
 
 #include <cmath>
 
 #include "build/build_config.h"
 #include "base/logging.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/infobar_container.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "ui/base/animation/slide_animation.h"
 
 SkColor GetInfoBarTopColor(InfoBarDelegate::Type infobar_type) {
   // Yellow
   static const SkColor kWarningBackgroundColorTop =
       SkColorSetRGB(255, 242, 183);
   // Gray
   static const SkColor kPageActionBackgroundColorTop =
@@ skipping 11 matching lines @@
   static const SkColor kPageActionBackgroundColorBottom =
       SkColorSetRGB(217, 217, 217);
 
   return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
       kWarningBackgroundColorBottom : kPageActionBackgroundColorBottom;
 }
 
 // TODO(pkasting): Port Mac to use this.
 #if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK)
 
 InfoBar::InfoBar(TabContentsWrapper* owner, InfoBarDelegate* delegate)

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

I think |owner| and |owner_| should be converted to InfoBarTabHelper*s.

     : owner_(owner),
       delegate_(delegate),
       container_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)),
       arrow_height_(0),
       arrow_target_height_(kDefaultArrowTargetHeight),
       arrow_half_width_(0),
       bar_height_(0),
       bar_target_height_(kDefaultBarTargetHeight) {
   DCHECK(owner_ != NULL);
@@ skipping 44 matching lines @@
 }
 
 void InfoBar::AnimationProgressed(const ui::Animation* animation) {
   RecalculateHeights(false);
 }
 
 void InfoBar::RemoveSelf() {
   // |owner_| can be NULL here, e.g. because the user clicks the close button
   // when the infobar is already closing.
   if (delegate_ && owner_)
-    owner_->RemoveInfoBar(delegate_);
+    owner_->infobar_tab_helper()->RemoveInfoBar(delegate_);
 }
 
 void InfoBar::SetBarTargetHeight(int height) {
   if (bar_target_height_ != height) {
     bar_target_height_ = height;
     RecalculateHeights(false);
   }
 }
 
 int InfoBar::OffsetY(const gfx::Size& prefsize) const {
@@ skipping 57 matching lines @@
 void InfoBar::MaybeDelete() {
   if (!owner_ && delegate_ && (animation_.GetCurrentValue() == 0.0)) {
     if (container_)
       container_->RemoveInfoBar(this);
     delegate_->InfoBarClosed();
     delegate_ = NULL;
   }
 }
 
 #endif  // TOOLKIT_VIEWS || TOOLKIT_GTK