Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/infobars/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/infobars/infobar.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "ui/gfx/animation/slide_animation.h"
 
-InfoBar::InfoBar(scoped_ptr<InfoBarDelegate> delegate)
-    : owner_(NULL),
-      delegate_(delegate.Pass()),
+InfoBar::InfoBar(InfoBarService* owner, InfoBarDelegate* delegate)
+    : owner_(owner),
+      delegate_(delegate),
       container_(NULL),
       animation_(this),
       arrow_height_(0),
       arrow_target_height_(kDefaultArrowTargetHeight),
       arrow_half_width_(0),
       bar_height_(0),
       bar_target_height_(kDefaultBarTargetHeight) {
+  DCHECK(owner_ != NULL);
   DCHECK(delegate_ != NULL);
   animation_.SetTweenType(gfx::Tween::LINEAR);
-  delegate_->set_infobar(this);
 }
 
 InfoBar::~InfoBar() {
-  DCHECK(!owner_);
 }
 
 // static
 SkColor InfoBar::GetTopColor(InfoBarDelegate::Type infobar_type) {
   static const SkColor kWarningBackgroundColorTop =
       SkColorSetRGB(255, 242, 183);  // Yellow
   static const SkColor kPageActionBackgroundColorTop =
       SkColorSetRGB(237, 237, 237);  // Gray
   return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
       kWarningBackgroundColorTop : kPageActionBackgroundColorTop;
 }
 
 // static
 SkColor InfoBar::GetBottomColor(InfoBarDelegate::Type infobar_type) {
   static const SkColor kWarningBackgroundColorBottom =
       SkColorSetRGB(250, 230, 145);  // Yellow
   static const SkColor kPageActionBackgroundColorBottom =
       SkColorSetRGB(217, 217, 217);  // Gray
   return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
       kWarningBackgroundColorBottom : kPageActionBackgroundColorBottom;
 }
 
-void InfoBar::SetOwner(InfoBarService* owner) {
-  DCHECK(!owner_);
-  owner_ = owner;
-  delegate_->StoreActiveEntryUniqueID();
-  PlatformSpecificSetOwner();
-}
-
 void InfoBar::Show(bool animate) {
   PlatformSpecificShow(animate);
   if (animate) {
     animation_.Show();
   } else {
     animation_.Reset(1.0);
     RecalculateHeights(true);
   }
 }
 
@@ skipping 20 matching lines @@
     RecalculateHeights(false);
   }
 }
 
 void InfoBar::CloseSoon() {
   owner_ = NULL;
   PlatformSpecificOnCloseSoon();
   MaybeDelete();
 }
 
-void InfoBar::RemoveSelf() {
-  if (owner_)
-    owner_->RemoveInfoBar(this);
-}
-
 void InfoBar::SetBarTargetHeight(int height) {
   if (bar_target_height_ != height) {
     bar_target_height_ = height;
     RecalculateHeights(false);
   }
 }
 
 void InfoBar::AnimationProgressed(const gfx::Animation* animation) {
   RecalculateHeights(false);
 }
 
+void InfoBar::RemoveSelf() {
+  // |owner_| should never be NULL here.  If it is, then someone violated what
+  // they were supposed to do -- e.g. a ConfirmInfoBarDelegate subclass returned
+  // true from Accept() or Cancel() even though the infobar was already closing.
+  // In the worst case, if we also switched tabs during that process, then
+  // |this| has already been destroyed.  But if that's the case, then we're
+  // going to deref a garbage |this| pointer here whether we check |owner_| or
+  // not, and in other cases (where we're still closing and |this| is valid),
+  // checking |owner_| here will avoid a NULL deref.
+  if (owner_)
+    owner_->RemoveInfoBar(delegate_);
+}
+
 int InfoBar::OffsetY(const gfx::Size& prefsize) const {
   return arrow_height_ +
       std::max((bar_target_height_ - prefsize.height()) / 2, 0) -
       (bar_target_height_ - bar_height_);
 }
 
 void InfoBar::AnimationEnded(const gfx::Animation* animation) {
   // When the animation ends, we must ensure the container is notified even if
   // the heights haven't changed, lest it never get an "animation finished"
   // notification.  (If the browser doesn't get this notification, it will not
@@ skipping 39 matching lines @@
   bool heights_differ =
       (old_arrow_height != arrow_height_) || (old_bar_height != bar_height_);
   if (heights_differ)
     PlatformSpecificOnHeightsRecalculated();
 
   if (container_ && (heights_differ || force_notify))
     container_->OnInfoBarStateChanged(animation_.is_animating());
 }
 
 void InfoBar::MaybeDelete() {
-  if (!owner_ && (animation_.GetCurrentValue() == 0.0)) {
+  if (!owner_ && delegate_ && (animation_.GetCurrentValue() == 0.0)) {
     if (container_)
       container_->RemoveInfoBar(this);
-    delete this;
+    delete delegate_;
+    delegate_ = NULL;
   }
 }