Infobar Componentization Proof of Concept

chrome/browser/media/midi_permission_infobar_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/midi_permission_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 10 matching lines @@
 InfoBar* MidiPermissionInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages) {
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
   return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate(
-          controller, id, requesting_frame,
+          infobar_service->web_contents(),
+          controller,
+          id,
+          requesting_frame,
           committed_entry ? committed_entry->GetUniqueID() : 0,
           display_languages))));
 }
 
 MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate(
+    content::WebContents* web_contents,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages)
-    : ConfirmInfoBarDelegate(),
+    : ContentConfirmInfoBarDelegate(web_contents),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame),
       contents_unique_id_(contents_unique_id),
-      display_languages_(display_languages) {
-}
+      display_languages_(display_languages) {}
 
 MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() {
 }
 
 void MidiPermissionInfoBarDelegate::InfoBarDismissed() {
   SetPermission(false, false);
 }
 
 int MidiPermissionInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_MIDI_SYSEX;
 }
 
 InfoBarDelegate::Type MidiPermissionInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 bool MidiPermissionInfoBarDelegate::ShouldExpireInternal(
-    const content::LoadCommittedDetails& details) const {
+    const NavigationDetails& details) const {
   // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but
   // uses the unique ID we set in the constructor instead of that stored in the
   // base class.
-  return (contents_unique_id_ != details.entry->GetUniqueID()) ||
-      (content::PageTransitionStripQualifier(
-          details.entry->GetTransitionType()) ==
-              content::PAGE_TRANSITION_RELOAD);
+  return (contents_unique_id_ != details.entry_id) || details.is_reload;
 }
 
 base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
       IDS_MIDI_SYSEX_INFOBAR_QUESTION,
       net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_));
 }
 
 base::string16 MidiPermissionInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_MIDI_SYSEX_ALLOW_BUTTON : IDS_MIDI_SYSEX_DENY_BUTTON);
 }
 
 bool MidiPermissionInfoBarDelegate::Accept() {
   SetPermission(true, true);
   return true;
 }
 
 bool MidiPermissionInfoBarDelegate::Cancel() {
   SetPermission(true, false);
   return true;
 }
 
 void MidiPermissionInfoBarDelegate::SetPermission(bool update_content_setting,
                                                   bool allowed) {
   controller_->OnPermissionSet(id_, requesting_frame_, web_contents()->GetURL(),
                                update_content_setting, allowed);
 }