Infobar Componentization Proof of Concept

chrome/browser/google/google_url_tracker_infobar_delegate.h

Index: chrome/browser/google/google_url_tracker_infobar_delegate.h
diff --git a/chrome/browser/google/google_url_tracker_infobar_delegate.h b/chrome/browser/google/google_url_tracker_infobar_delegate.h
index cbeab033464190bf6be651d114107bdd8505c966..9024aa4ddc605281f8d39d4474959ecb8fd9ee64 100644
--- a/chrome/browser/google/google_url_tracker_infobar_delegate.h
+++ b/chrome/browser/google/google_url_tracker_infobar_delegate.h
@@ -5,14 +5,15 @@
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_INFOBAR_DELEGATE_H_
 
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/content_confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
 class GoogleURLTracker;
+class InfoBarService;
 
 // This infobar is shown by the GoogleURLTracker when the Google base URL has
 // changed.
-class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
+class GoogleURLTrackerInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  public:
   // Creates a Google URL tracker infobar and delegate and adds the infobar to
   // |infobar_service|.  Returns the infobar if it was successfully added.
@@ -35,7 +36,8 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual void Close(bool redo_search);
 
  protected:
-  GoogleURLTrackerInfoBarDelegate(GoogleURLTracker* google_url_tracker,
+  GoogleURLTrackerInfoBarDelegate(content::WebContents* web_contents,
+                                  GoogleURLTracker* google_url_tracker,
                                   const GURL& search_url);
   virtual ~GoogleURLTrackerInfoBarDelegate();
 
@@ -45,8 +47,8 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual base::string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
-  virtual bool ShouldExpireInternal(
-      const content::LoadCommittedDetails& details) const OVERRIDE;
+  virtual bool ShouldExpireInternal(const NavigationDetails& details) const
+      OVERRIDE;
 
   GoogleURLTracker* google_url_tracker_;
   GURL search_url_;