Infobar Componentization Proof of Concept

chrome/browser/media/midi_permission_infobar_delegate.h

Index: chrome/browser/media/midi_permission_infobar_delegate.h
diff --git a/chrome/browser/media/midi_permission_infobar_delegate.h b/chrome/browser/media/midi_permission_infobar_delegate.h
index b73fcc766f9e49829ddebea9b65896b81930123d..efa952efb45ba256764d9e8dfc95e3339d98ef25 100644
--- a/chrome/browser/media/midi_permission_infobar_delegate.h
+++ b/chrome/browser/media/midi_permission_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;
 // MidiPermissionInfoBarDelegates are created by the
 // ChromeMidiPermissionContext to control the display and handling of MIDI
 // permission infobars to the user.
-class MidiPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
+class MidiPermissionInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  public:
   // Creates a MIDI permission infobar and delegate and adds the infobar to
   // |infobar_service|.  Returns the infobar if it was successfully added.
@@ -28,7 +28,8 @@ class MidiPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
                          const std::string& display_languages);
 
  private:
-  MidiPermissionInfoBarDelegate(PermissionQueueController* controller,
+  MidiPermissionInfoBarDelegate(content::WebContents* web_contents,
+                                PermissionQueueController* controller,
                                 const PermissionRequestID& id,
                                 const GURL& requesting_frame,
                                 int contents_unique_id,
@@ -39,8 +40,8 @@ class MidiPermissionInfoBarDelegate : 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 Accept() OVERRIDE;