Split InfoBarService core code into InfoBarManager

chrome/browser/infobars/infobar_manager.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_SERVICE_H_
-#define CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_
+#ifndef CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_H_
+#define CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "content/public/browser/web_contents_user_data.h"
+
+namespace content {
+struct LoadCommittedDetails;
+class WebContents;
+}
 
 class InfoBar;
 
 // Provides access to creating, removing and enumerating info bars
 // attached to a tab.
-class InfoBarService : public content::WebContentsObserver,
-                       public content::WebContentsUserData<InfoBarService> {
+class InfoBarManager {
  public:
-
   // Observer class for infobar events.
   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 OnServiceShuttingDown(InfoBarService* service) = 0;
+    virtual void OnManagerShuttingDown(InfoBarManager* manager) = 0;
   };
 
+  explicit InfoBarManager(content::WebContents* web_contents);
+  ~InfoBarManager();
+
   // 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);
 
@@ skipping 13 matching lines @@
   //
   // Returns the new infobar if it was successfully added.
   //
   // NOTE: This does not perform any EqualsDelegate() checks like AddInfoBar().
   InfoBar* ReplaceInfoBar(InfoBar* old_infobar,
                           scoped_ptr<InfoBar> new_infobar);
 
   // Returns the number of infobars for this tab.
   size_t infobar_count() const { return infobars_.size(); }
 
-  // Returns the infobar at the given |index|.  The InfoBarService retains
+  // 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]; }
 
+  // Removes all the infobars.

[Peter Kasting, 2014/03/26 23:51:30]

Nit: This should be up be RemoveInfoBar().

+  void RemoveAllInfoBars(bool animate);
+
   // Retrieve the WebContents for the tab this service is associated with.
-  content::WebContents* web_contents() {
-    return content::WebContentsObserver::web_contents();
-  }
+  // Do not add new call sites for this.
+  // TODO(droger): remove this method. See http://crbug.com/

[blundell, 2014/03/27 09:40:30]

bug number?

+  content::WebContents* web_contents() { return web_contents_; }
+
+  // Must be called when a navigation happens.
+  void OnNavigation(const content::LoadCommittedDetails& load_details);
+
+  // Called when the associated WebContents is being destroyed.
+  void CleanUp();

[Peter Kasting, 2014/03/26 23:51:30]

Nit: Why is the name of this so vague?  Why isn't this OnWebContentsDestroyed()?

[blundell, 2014/03/27 09:40:30]

This method is going to stay in InfoBarManager after InfoBarManager no longer
has knowledge of WebContents, so it can't be called OnWebContentsDestroyed().
We're not tied to this name if there's anything (abstract) that seems better.

On 2014/03/26 23:51:30, Peter Kasting wrote:

[Peter Kasting, 2014/03/27 17:51:33]

What's it going to do at that point?

(Side note: Please always reply-at-bottom in Rietveld comments, it's really
confusing to read the resulting emails if you reply-at-top.)

 
   void AddObserver(Observer* obs);
   void RemoveObserver(Observer* obs);
 
  private:
-  friend class content::WebContentsUserData<InfoBarService>;
-
-  // InfoBars associated with this InfoBarService.  We own these pointers.
+  // 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;
 
-  explicit InfoBarService(content::WebContents* web_contents);
-  virtual ~InfoBarService();
-
-  // content::WebContentsObserver:
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
-  virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) OVERRIDE;
-  virtual void WebContentsDestroyed(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-
   void RemoveInfoBarInternal(InfoBar* infobar, bool animate);
-  void RemoveAllInfoBars(bool animate);
-
-  // Message handlers.
-  void OnDidBlockDisplayingInsecureContent();
-  void OnDidBlockRunningInsecureContent();
 
   InfoBars infobars_;
   bool infobars_enabled_;
+  content::WebContents* web_contents_;

[blundell, 2014/03/27 09:40:30]

Put a TODO and bug reference here as well.

   ObserverList<Observer, true> observer_list_;
 
-  DISALLOW_COPY_AND_ASSIGN(InfoBarService);
+  DISALLOW_COPY_AND_ASSIGN(InfoBarManager);
 };
 
-#endif  // CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_
+#endif  // CHROME_BROWSER_INFOBARS_INFOBAR_MANAGER_H_