InfoBarService inherits from InfoBarManager

chrome/browser/infobars/infobar_manager.h

 // Copyright 2014 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_INFOBARS_INFOBAR_MANAGER_H_
 #define CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 14 matching lines @@
   class Observer {
    public:
     virtual void OnInfoBarAdded(InfoBar* infobar) = 0;
     virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate) = 0;
     virtual void OnInfoBarReplaced(InfoBar* old_infobar,
                                    InfoBar* new_infobar) = 0;
     virtual void OnManagerShuttingDown(InfoBarManager* manager) = 0;
   };
 
   explicit InfoBarManager(content::WebContents* web_contents);
-  ~InfoBarManager();
+  virtual ~InfoBarManager();
+
+  // Must be called before destruction.
+  void ShutDown();

[droger, 2014/04/08 15:00:11]

This method is needed as there are virtual calls during the destructor
otherwise.
These virtual calls are only needed for notifications, so we should be able to
remove the shutdown method once the notifications are killed.

[Peter Kasting, 2014/04/08 20:39:56]

I'd add a comment to that effect.

 
   // Adds the specified |infobar|, which already owns a delegate.
   //
   // If infobars are disabled for this tab or the tab already has an infobar
   // whose delegate returns true for
   // InfoBarDelegate::EqualsDelegate(infobar->delegate()), |infobar| is deleted
   // immediately without being added.
   //
   // Returns the infobar if it was successfully added.
-  virtual InfoBar* AddInfoBar(scoped_ptr<InfoBar> infobar);
+  InfoBar* AddInfoBar(scoped_ptr<InfoBar> infobar);
 
   // Removes the specified |infobar|.  This in turn may close immediately or
   // animate closed; at the end the infobar will delete itself.
   //
   // If infobars are disabled for this tab, this will do nothing, on the
   // assumption that the matching AddInfoBar() call will have already deleted
   // the infobar (see above).
   void RemoveInfoBar(InfoBar* infobar);
 
   // Removes all the infobars.
@@ skipping 16 matching lines @@
 
   // Returns the infobar at the given |index|.  The InfoBarManager retains
   // ownership.
   //
   // Warning: Does not sanity check |index|.
   InfoBar* infobar_at(size_t index) { return infobars_[index]; }
 
   // Retrieve the WebContents for the tab this service is associated with.
   // Do not add new call sites for this.
   // TODO(droger): remove this method. See http://crbug.com/354379.
   content::WebContents* web_contents() { return web_contents_; }

[Peter Kasting, 2014/04/08 20:39:56]

Can this method (and member) be removed too?

[droger, 2014/04/08 20:54:46]

I'd prefer doing it in another CL  if you don't mind, as there are still a few
callers.

 
   // Must be called when a navigation happens.
   void OnNavigation(const InfoBarDelegate::NavigationDetails& details);
 
   // Called when the associated WebContents is being destroyed.
   void OnWebContentsDestroyed();
 
   void AddObserver(Observer* obs);
   void RemoveObserver(Observer* obs);
 
+ protected:
+  // Notifies the observer in |observer_list_|.
+  virtual void NotifyInfoBarAdded(InfoBar* infobar);
+  virtual void NotifyInfoBarRemoved(InfoBar* infobar, bool animate);
+  virtual void NotifyInfoBarReplaced(InfoBar* old_infobar,
+                                     InfoBar* new_infobar);
+  void NotifyManagerShuttingDown();
+
  private:
   // InfoBars associated with this InfoBarManager.  We own these pointers.
   // However, this is not a ScopedVector, because we don't delete the infobars
   // directly once they've been added to this; instead, when we're done with an
   // infobar, we instruct it to delete itself and then orphan it.  See
   // RemoveInfoBarInternal().
   typedef std::vector<InfoBar*> InfoBars;
 
   void RemoveInfoBarInternal(InfoBar* infobar, bool animate);
 
   InfoBars infobars_;
   bool infobars_enabled_;
+  bool did_shut_down_;
 
   // TODO(droger): remove this field. See http://crbug.com/354379.
   content::WebContents* web_contents_;
 
   ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarManager);
 };
 
 #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_H_