Infobar Componentization Proof of Concept

chrome/browser/google/google_url_tracker_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/google/google_url_tracker_infobar_delegate.h"
 
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // static
 InfoBar* GoogleURLTrackerInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     GoogleURLTracker* google_url_tracker,
     const GURL& search_url) {
   return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new GoogleURLTrackerInfoBarDelegate(
-          google_url_tracker, search_url))));
+          infobar_service->web_contents(), google_url_tracker, search_url))));
 }
 
 bool GoogleURLTrackerInfoBarDelegate::Accept() {
   google_url_tracker_->AcceptGoogleURL(true);
   return false;
 }
 
 bool GoogleURLTrackerInfoBarDelegate::Cancel() {
   google_url_tracker_->CancelGoogleURL();
   return false;
 }
 
 void GoogleURLTrackerInfoBarDelegate::Update(const GURL& search_url) {
-  StoreActiveEntryUniqueID();
+  content::NavigationEntry* active_entry =
+      web_contents()->GetController().GetActiveEntry();
+  int entry_id = active_entry ? active_entry->GetUniqueID() : 0;
+  StoreActiveEntryUniqueID(entry_id);
   search_url_ = search_url;
   pending_id_ = 0;
 }
 
 void GoogleURLTrackerInfoBarDelegate::Close(bool redo_search) {
   // Calling OpenURL() will auto-close us asynchronously.  It's easier for
   // various classes (e.g. GoogleURLTrackerMapEntry) to reason about things if
   // the closure always happens synchronously, so we always call RemoveInfoBar()
   // directly, then OpenURL() if desirable.  (This calling order is safer if
   // for some reason in the future OpenURL() were to close us synchronously.)
@@ skipping 12 matching lines @@
   // WARNING: |this| may be deleted at this point!  Do not access any members!
 
   if (new_search_url.is_valid()) {
     contents->OpenURL(content::OpenURLParams(
         new_search_url, content::Referrer(), CURRENT_TAB,
         content::PAGE_TRANSITION_GENERATED, false));
   }
 }
 
 GoogleURLTrackerInfoBarDelegate::GoogleURLTrackerInfoBarDelegate(
+    content::WebContents* web_contents,
     GoogleURLTracker* google_url_tracker,
     const GURL& search_url)
-    : ConfirmInfoBarDelegate(),
+    : ContentConfirmInfoBarDelegate(web_contents),
       google_url_tracker_(google_url_tracker),
       search_url_(search_url),
-      pending_id_(0) {
-}
+      pending_id_(0) {}
 
 GoogleURLTrackerInfoBarDelegate::~GoogleURLTrackerInfoBarDelegate() {
 }
 
 base::string16 GoogleURLTrackerInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
       IDS_GOOGLE_URL_TRACKER_INFOBAR_MESSAGE,
       net::StripWWWFromHost(google_url_tracker_->fetched_google_url()),
       net::StripWWWFromHost(google_url_tracker_->google_url()));
 }
@@ skipping 20 matching lines @@
       google_util::AppendGoogleLocaleParam(GURL(
           "https://www.google.com/support/chrome/bin/answer.py?"
           "answer=1618699")),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal(
-    const content::LoadCommittedDetails& details) const {
-  int unique_id = details.entry->GetUniqueID();
-  return (unique_id != contents_unique_id()) && (unique_id != pending_id_);
+    const NavigationDetails& details) const {
+  return (details.entry_id != contents_unique_id()) &&
+         (details.entry_id != pending_id_);
 }