Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4252)

Unified Diff: chrome/browser/infobars/infobar_service.h

Issue 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/infobars/infobar_manager.cc ('k') | chrome/browser/infobars/infobar_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/infobars/infobar_service.h
diff --git a/chrome/browser/infobars/infobar_service.h b/chrome/browser/infobars/infobar_service.h
index 7be2e7c096ef703eec5aa72348990d6f8d04f7a8..f918da7a869a485c18d1f284ec77e12ebf58f7c5 100644
--- a/chrome/browser/infobars/infobar_service.h
+++ b/chrome/browser/infobars/infobar_service.h
@@ -8,85 +8,44 @@
#include <vector>
#include "base/memory/scoped_ptr.h"
-#include "base/observer_list.h"
+#include "chrome/browser/infobars/infobar_manager.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.
+// Associates a Tab to a InfoBarManager and manages its lifetime.
+// It manages the infobar notifications and responds to navigation events.
class InfoBarService : public content::WebContentsObserver,
- public content::WebContentsUserData<InfoBarService> {
+ public content::WebContentsUserData<InfoBarService>,
+ public InfoBarManager::Observer {
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;
- };
-
- // 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);
-
- // 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);
-
- // Replaces one infobar with another, without any animation in between. This
- // will result in |old_infobar| being synchronously deleted.
- //
- // If infobars are disabled for this tab, |new_infobar| is deleted immediately
- // without being added, and nothing else happens.
- //
- // Returns the new infobar if it was successfully added.
- //
- // NOTE: This does not perform any EqualsDelegate() checks like AddInfoBar().
+ // Helper function to get the InfoBarManager attached to |web_contents|.
+ static InfoBarManager* InfoBarManagerFromWebContents(
+ content::WebContents* web_contents);
+
+ // These methods are simple pass-throughs to InfoBarManager, and are here to
+ // prepare for the componentization of Infobars, see http://crbug.com/354379.
+ InfoBar* AddInfoBar(scoped_ptr<InfoBar> infobar);
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
- // 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.
content::WebContents* web_contents() {
return content::WebContentsObserver::web_contents();
}
- void AddObserver(Observer* obs);
- void RemoveObserver(Observer* obs);
+ InfoBarManager* infobar_manager() { return &infobar_manager_; }
private:
friend class content::WebContentsUserData<InfoBarService>;
- // InfoBars associated with this InfoBarService. 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();
@@ -98,16 +57,18 @@ class InfoBarService : public content::WebContentsObserver,
content::WebContents* web_contents) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- void RemoveInfoBarInternal(InfoBar* infobar, bool animate);
- void RemoveAllInfoBars(bool animate);
+ // InfoBarManager::Observer:
+ virtual void OnInfoBarAdded(InfoBar* infobar) OVERRIDE;
+ virtual void OnInfoBarReplaced(InfoBar* old_infobar,
+ InfoBar* new_infobar) OVERRIDE;
+ virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate) OVERRIDE;
+ virtual void OnManagerShuttingDown(InfoBarManager* manager) OVERRIDE;
// Message handlers.
void OnDidBlockDisplayingInsecureContent();
void OnDidBlockRunningInsecureContent();
- InfoBars infobars_;
- bool infobars_enabled_;
- ObserverList<Observer, true> observer_list_;
+ InfoBarManager infobar_manager_;
DISALLOW_COPY_AND_ASSIGN(InfoBarService);
};
« no previous file with comments | « chrome/browser/infobars/infobar_manager.cc ('k') | chrome/browser/infobars/infobar_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698