Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

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

Issue 240193003: Move Infobars core files to the Infobars component (Closed) Base URL: svn://
Patch Set: fix nib name on mac Created 6 years, 8 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/ ('k') | chrome/browser/infobars/ » ('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 ea24fc5698991ebaab3e7954e3298df71498b058..39cca9a8d945615d14a501c4b500e36204f198c7 100644
--- a/chrome/browser/infobars/infobar_service.h
+++ b/chrome/browser/infobars/infobar_service.h
@@ -8,7 +8,7 @@
#include <vector>
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/infobars/infobar_manager.h"
+#include "components/infobars/core/infobar_manager.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
@@ -17,22 +17,25 @@ struct LoadCommittedDetails;
class WebContents;
+namespace infobars {
class InfoBar;
// Associates a Tab to a InfoBarManager and manages its lifetime.
// It manages the infobar notifications and responds to navigation events.
-class InfoBarService : public InfoBarManager,
+class InfoBarService : public infobars::InfoBarManager,
public content::WebContentsObserver,
public content::WebContentsUserData<InfoBarService> {
- static InfoBarDelegate::NavigationDetails
+ static infobars::InfoBarDelegate::NavigationDetails
const content::LoadCommittedDetails& details);
// This function must only be called on infobars that are owned by an
// InfoBarService instance (or not owned at all, in which case this returns
// NULL).
- static content::WebContents* WebContentsFromInfoBar(InfoBar* infobar);
+ static content::WebContents* WebContentsFromInfoBar(
+ infobars::InfoBar* infobar);
// Retrieve the WebContents for the tab this service is associated with.
content::WebContents* web_contents() {
@@ -49,10 +52,11 @@ class InfoBarService : public InfoBarManager,
virtual int GetActiveEntryID() OVERRIDE;
// TODO(droger): Remove these functions once infobar notifications are
// removed. See
- virtual void NotifyInfoBarAdded(InfoBar* infobar) OVERRIDE;
- virtual void NotifyInfoBarRemoved(InfoBar* infobar, bool animate) OVERRIDE;
- virtual void NotifyInfoBarReplaced(InfoBar* old_infobar,
- InfoBar* new_infobar) OVERRIDE;
+ virtual void NotifyInfoBarAdded(infobars::InfoBar* infobar) OVERRIDE;
+ virtual void NotifyInfoBarRemoved(infobars::InfoBar* infobar,
+ bool animate) OVERRIDE;
+ virtual void NotifyInfoBarReplaced(infobars::InfoBar* old_infobar,
+ infobars::InfoBar* new_infobar) OVERRIDE;
// content::WebContentsObserver:
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
« no previous file with comments | « chrome/browser/infobars/ ('k') | chrome/browser/infobars/ » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698