Make TabContents own its infobar delegates....

chrome/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 439 matching lines @@
   // Returns true if the location bar should be focused by default rather than
   // the page contents. The view calls this function when the tab is focused
   // to see what it should do.
   virtual bool FocusLocationBarByDefault();
 
   // Focuses the location bar.
   virtual void SetFocusToLocationBar(bool select_all);
 
   // Infobars ------------------------------------------------------------------
 
-  // Adds an InfoBar for the specified |delegate|.
+  // Adds an InfoBar for the specified |delegate|.  The TabContents takes
+  // ownership of |delegate| and will close it when it is removed or the tab is
+  // closed.  If infobars are disabled for this tab or the tab already has a
+  // delegate which returns true for InfoBarDelegate::EqualsDelegate(delegate),
+  // |delegate| is closed immediately without being added.
   virtual void AddInfoBar(InfoBarDelegate* delegate);
 
-  // Removes the InfoBar for the specified |delegate|.
+  // Removes the InfoBar for the specified |delegate|.  This will synchronously
+  // trigger delegate->InfoBarClosed() (which generally deletes the delegate).
+  // If infobars are disabled for this tab, this will do nothing, on the
+  // assumption that the matching AddInfoBar() call will have already closed the
+  // delegate (see above).
   void RemoveInfoBar(InfoBarDelegate* delegate);
 
-  // Replaces one infobar with another, without any animation in between.
+  // Replaces one infobar with another, without any animation in between.  This
+  // will synchronously close |old_delegate|.  If infobars are disabled for this
+  // tab, |new_delegate| is closed immediately without being added.
+  // NOTE: This does not perform any EqualsDelegate() checks like AddInfoBar().
   void ReplaceInfoBar(InfoBarDelegate* old_delegate,
                       InfoBarDelegate* new_delegate);
 
   // Enumeration and access functions.
   int infobar_delegate_count() const { return infobar_delegates_.size(); }
   InfoBarDelegate* GetInfoBarDelegateAt(int index) {
-    return infobar_delegates_.at(index);
+    return infobar_delegates_[index];
   }
 
   // Toolbars and such ---------------------------------------------------------
 
   // Returns true if a Bookmark Bar should be shown for this tab.
   virtual bool ShouldShowBookmarkBar();
 
   // Notifies the delegate that a download is about to be started.
   // This notification is fired before a local temporary file has been created.
   bool CanDownload(int request_id);
@@ skipping 700 matching lines @@
 
   // TODO(pkasting): Hack to try and fix Linux browser tests.
   bool dont_notify_render_view_;
 
   // True if this is a secure page which displayed insecure content.
   bool displayed_insecure_content_;
 
   // Data for shelves and stuff ------------------------------------------------
 
   // Delegates for InfoBars associated with this TabContents.
-  std::vector<InfoBarDelegate*> infobar_delegates_;
+  typedef std::vector<InfoBarDelegate*> InfoBarDelegates;
+  InfoBarDelegates infobar_delegates_;
 
   // Data for find in page -----------------------------------------------------
 
   // TODO(brettw) this should be separated into a helper class.
 
   // Each time a search request comes in we assign it an id before passing it
   // over the IPC so that when the results come in we can evaluate whether we
   // still care about the results of the search (in some cases we don't because
   // the user has issued a new search).
   static int find_request_id_counter_;
@@ skipping 110 matching lines @@
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_