Infobar Componentization Proof of Concept

chrome/browser/geolocation/geolocation_infobar_delegate.cc

 // Copyright (c) 2012 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/geolocation/geolocation_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 54 matching lines @@
 InfoBar* GeolocationInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages,
     const std::string& accept_button_label) {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_CREATE);
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
-  GeolocationInfoBarDelegate* const delegate = new DelegateType(
-          controller, id, requesting_frame,
-          committed_entry ? committed_entry->GetUniqueID() : 0,
-          display_languages, accept_button_label);
+  GeolocationInfoBarDelegate* const delegate =
+      new DelegateType(infobar_service->web_contents(),
+                       controller,
+                       id,
+                       requesting_frame,
+                       committed_entry ? committed_entry->GetUniqueID() : 0,
+                       display_languages,
+                       accept_button_label);
 
   InfoBar* infobar = ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(delegate)).release();
   return infobar_service->AddInfoBar(scoped_ptr<InfoBar>(infobar));
 }
 
 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate(
+    content::WebContents* web_contents,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages,
     const std::string& accept_button_label)
-    : ConfirmInfoBarDelegate(),
+    : ContentConfirmInfoBarDelegate(web_contents),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame.GetOrigin()),
       contents_unique_id_(contents_unique_id),
       display_languages_(display_languages),
-      user_has_interacted_(false) {
-}
+      user_has_interacted_(false) {}
 
 GeolocationInfoBarDelegate::~GeolocationInfoBarDelegate() {
   if (!user_has_interacted_)
     RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_IGNORED);
 }
 
 bool GeolocationInfoBarDelegate::Accept() {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_ALLOW);
   set_user_has_interacted();
   SetPermission(true, true);
@@ skipping 16 matching lines @@
 
 int GeolocationInfoBarDelegate::GetIconID() const {
   return IDR_GEOLOCATION_INFOBAR_ICON;
 }
 
 InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 bool GeolocationInfoBarDelegate::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 GeolocationInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_GEOLOCATION_INFOBAR_QUESTION,
       net::FormatUrl(requesting_frame_, display_languages_));
 }
 
 base::string16 GeolocationInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
@@ skipping 23 matching lines @@
       "https://www.google.com/support/chrome/bin/answer.py?answer=142065";
 #endif
 
   web_contents()->OpenURL(content::OpenURLParams(
       google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;  // Do not dismiss the info bar.
 }