Infobar Componentization Proof of Concept

chrome/browser/geolocation/geolocation_infobar_delegate.h

Index: chrome/browser/geolocation/geolocation_infobar_delegate.h
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.h b/chrome/browser/geolocation/geolocation_infobar_delegate.h
index 52f96ea6ce3dc633bdb9180773daea2854aa2617..83e1571791dd9861e65999c8ac6314aa918da72b 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/content_settings/permission_request_id.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/content_confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
 class PermissionQueueController;
@@ -17,7 +17,7 @@ class InfoBarService;
 // GeolocationInfoBarDelegates are created by the
 // GeolocationInfoBarQueueController to control the display
 // and handling of geolocation permission infobars to the user.
-class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
+class GeolocationInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  public:
   // Creates a geolocation infobar and delegate and adds the infobar to
   // |infobar_service|.  Returns the infobar if it was successfully added.
@@ -29,7 +29,8 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
                          const std::string& accept_button_label);
 
  protected:
-  GeolocationInfoBarDelegate(PermissionQueueController* controller,
+  GeolocationInfoBarDelegate(content::WebContents* web_contents,
+                             PermissionQueueController* controller,
                              const PermissionRequestID& id,
                              const GURL& requesting_frame,
                              int contents_unique_id,
@@ -55,8 +56,8 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual void InfoBarDismissed() OVERRIDE;
   virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
-  virtual bool ShouldExpireInternal(
-      const content::LoadCommittedDetails& details) const OVERRIDE;
+  virtual bool ShouldExpireInternal(const NavigationDetails& details) const
+      OVERRIDE;
   virtual base::string16 GetMessageText() const OVERRIDE;
   virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;