Make TabContents own its infobar delegates....

chrome/browser/ui/views/infobars/infobars.cc

 // Copyright (c) 2010 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/views/infobars/infobars.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #if defined(OS_WIN)
@@ skipping 125 matching lines @@
 void InfoBar::Layout() {
   gfx::Size button_ps = close_button_->GetPreferredSize();
   close_button_->SetBounds(width() - kHorizontalPadding - button_ps.width(),
                            OffsetY(this, button_ps), button_ps.width(),
                            button_ps.height());
 }
 
 void InfoBar::ViewHierarchyChanged(bool is_add, views::View* parent,
                                    views::View* child) {
   if (child == this) {
-    if (is_add) {
+    if (is_add)
       InfoBarAdded();
-    } else {
+    else
       InfoBarRemoved();
-    }
   }
 
   if (GetWidget() && GetWidget()->IsAccessibleWidget()) {
     // For accessibility, make the close button the last child view.
     if (parent == this && child != close_button_ &&
         HasChildView(close_button_) &&
         GetChildViewAt(GetChildViewCount() - 1) != close_button_) {
       RemoveChildView(close_button_);
       AddChildView(close_button_);
     }
@@ skipping 20 matching lines @@
 }
 
 int InfoBar::OffsetY(views::View* parent, const gfx::Size prefsize) {
   return CenterY(prefsize) -
       (static_cast<int>(target_height_) - parent->height());
 }
 
 // InfoBar, views::ButtonListener implementation: ------------------
 
 void InfoBar::ButtonPressed(views::Button* sender, const views::Event& event) {
-  if (sender == close_button_) {
-    if (delegate_)
-      delegate_->InfoBarDismissed();
+  if ((sender == close_button_) && delegate_) {
+    delegate_->InfoBarDismissed();
     RemoveInfoBar();
   }
 }
 
 // InfoBar, views::FocusChangeListener implementation: ------------------
 
 void InfoBar::FocusWillChange(View* focused_before, View* focused_now) {
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now &&
       !this->IsParentOf(focused_before) && this->IsParentOf(focused_now)) {
     NotifyAccessibilityEvent(AccessibilityTypes::EVENT_ALERT);
   }
 }
 
 // InfoBar, AnimationDelegate implementation: ----------------------------------
 
 void InfoBar::AnimationProgressed(const Animation* animation) {
   if (container_)
     container_->InfoBarAnimated(true);
 }
 
 void InfoBar::AnimationEnded(const Animation* animation) {
   if (container_) {
     container_->InfoBarAnimated(false);
-
     if (!animation_->IsShowing())
       Close();
   }
 }
 
 // InfoBar, private: -----------------------------------------------------------
 
 void InfoBar::AnimateOpen() {
   animation_->Show();
 }
 
 void InfoBar::Open() {
   // Set the animation value to 1.0 so that GetPreferredSize() returns the right
   // size.
   animation_->Reset(1.0);
   if (container_)
     container_->InfoBarAnimated(false);
 }
 
 void InfoBar::AnimateClose() {
+  delegate_ = NULL;
   bool restore_focus = true;
 #if defined(OS_WIN)
   // Do not restore focus (and active state with it) on Windows if some other
   // top-level window became active.
   if (GetWidget() &&
       !win_util::DoesWindowBelongToActiveWindow(GetWidget()->GetNativeView())) {
     restore_focus = false;
   }
 #endif  // defined(OS_WIN)
   DestroyFocusTracker(restore_focus);
   animation_->Hide();
 }
 
 void InfoBar::Close() {
+  delegate_ = NULL;
   GetParent()->RemoveChildView(this);
-  // Note that we only tell the delegate we're closed here, and not when we're
-  // simply destroyed (by virtue of a tab switch or being moved from window to
-  // window), since this action can cause the delegate to destroy itself.
-  if (delegate_) {
-    delegate_->InfoBarClosed();
-    delegate_ = NULL;
-  }
 }
 
 void InfoBar::InfoBarAdded() {
   // The container_ pointer must be set before adding to the view hierarchy.
   DCHECK(container_);
 #if defined(OS_WIN)
   // When we're added to a view hierarchy within a widget, we create an
   // external focus tracker to track what was focused in case we obtain
   // focus so that we can restore focus when we're removed.
   views::Widget* widget = GetWidget();
@@ skipping 123 matching lines @@
   AddChildView(link_);
 }
 
 LinkInfoBar::~LinkInfoBar() {
 }
 
 // LinkInfoBar, views::LinkController implementation: --------------------------
 
 void LinkInfoBar::LinkActivated(views::Link* source, int event_flags) {
   DCHECK(source == link_);
-  if (GetDelegate()->LinkClicked(
-          event_utils::DispositionFromEventFlags(event_flags))) {
+  if (delegate() && GetDelegate()->LinkClicked(
+      event_utils::DispositionFromEventFlags(event_flags)))
     RemoveInfoBar();
-  }
 }
 
 // LinkInfoBar, views::View overrides: -----------------------------------------
 
 void LinkInfoBar::Layout() {
   // Layout the close button.
   InfoBar::Layout();
 
   // Layout the icon.
   gfx::Size icon_ps = icon_->GetPreferredSize();
@@ skipping 35 matching lines @@
 // LinkInfoBar, private: -------------------------------------------------------
 
 LinkInfoBarDelegate* LinkInfoBar::GetDelegate() {
   return delegate()->AsLinkInfoBarDelegate();
 }
 
 // ConfirmInfoBar, public: -----------------------------------------------------
 
 ConfirmInfoBar::ConfirmInfoBar(ConfirmInfoBarDelegate* delegate)
     : AlertInfoBar(delegate),
+      cached_buttons_(delegate->GetButtons()),
       ok_button_(NULL),
       cancel_button_(NULL),
       link_(NULL),
       initialized_(false) {
   ok_button_ = new views::NativeButton(this,
       UTF16ToWideHack(delegate->GetButtonLabel(
                           ConfirmInfoBarDelegate::BUTTON_OK)));
   ok_button_->SetAccessibleName(ok_button_->label());
   if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK_DEFAULT)
     ok_button_->SetAppearsAsDefault(true);
@@ skipping 21 matching lines @@
     delete link_;
   }
 }
 
 // ConfirmInfoBar, views::LinkController implementation: -----------------------
 
 void ConfirmInfoBar::LinkActivated(views::Link* source, int event_flags) {
   DCHECK(source == link_);
   DCHECK(link_->IsVisible());
   DCHECK(!link_->GetText().empty());
-  if (GetDelegate()->LinkClicked(
-          event_utils::DispositionFromEventFlags(event_flags))) {
+  if (delegate() && GetDelegate()->LinkClicked(
+      event_utils::DispositionFromEventFlags(event_flags)))
     RemoveInfoBar();
-  }
 }
 
 // ConfirmInfoBar, views::View overrides: --------------------------------------
 
 void ConfirmInfoBar::Layout() {
   // First layout right aligned items (from right to left) in order to determine
   // the space avalable, then layout the left aligned items.
 
   // Layout the close button.
   InfoBar::Layout();
 
   // Layout the cancel and OK buttons.
   int available_width = AlertInfoBar::GetAvailableWidth();
   int ok_button_width = 0;
   int cancel_button_width = 0;
   gfx::Size ok_ps = ok_button_->GetPreferredSize();
   gfx::Size cancel_ps = cancel_button_->GetPreferredSize();
 
-  if (GetDelegate()->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK) {
+  // Cache the button set so that once the delegate goes away we can still
+  // Layout() (e.g. in the case of AnimateClose()).
+  if (delegate())
+    cached_buttons_ = GetDelegate()->GetButtons();
+  if (cached_buttons_ & ConfirmInfoBarDelegate::BUTTON_OK)
     ok_button_width = ok_ps.width();
-  } else {
+  else
     ok_button_->SetVisible(false);
-  }
-  if (GetDelegate()->GetButtons() & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
+  if (cached_buttons_ & ConfirmInfoBarDelegate::BUTTON_CANCEL)
     cancel_button_width = cancel_ps.width();
-  } else {
+  else
     cancel_button_->SetVisible(false);
-  }
 
   cancel_button_->SetBounds(available_width - cancel_button_width,
                             OffsetY(this, cancel_ps), cancel_ps.width(),
                             cancel_ps.height());
   int spacing = cancel_button_width > 0 ? kButtonButtonSpacing : 0;
   ok_button_->SetBounds(cancel_button_->x() - spacing - ok_button_width,
                         OffsetY(this, ok_ps), ok_ps.width(), ok_ps.height());
 
   // Layout the icon and label.
   AlertInfoBar::Layout();
@@ skipping 11 matching lines @@
                                           views::View* child) {
   if (is_add && child == this && !initialized_) {
     Init();
     initialized_ = true;
   }
   InfoBar::ViewHierarchyChanged(is_add, parent, child);
 }
 
 // ConfirmInfoBar, views::ButtonListener implementation: ---------------
 
-void ConfirmInfoBar::ButtonPressed(
-    views::Button* sender, const views::Event& event) {
+void ConfirmInfoBar::ButtonPressed(views::Button* sender,
+                                   const views::Event& event) {
   InfoBar::ButtonPressed(sender, event);
+  if (!GetDelegate())
+    return;
   if (sender == ok_button_) {
     if (GetDelegate()->Accept())
       RemoveInfoBar();
   } else if (sender == cancel_button_) {
     if (GetDelegate()->Cancel())
       RemoveInfoBar();
   }
 }
 
 // ConfirmInfoBar, InfoBar overrides: ------------------------------------------
@@ skipping 24 matching lines @@
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }