Infobar Componentization Proof of Concept

chrome/browser/infobars/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/infobars/infobar_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar.h"
-#include "chrome/browser/infobars/infobar_service.h"
-#include "content/public/browser/navigation_controller.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
 
-using content::NavigationEntry;
 
 // InfoBarDelegate ------------------------------------------------------------
 
 const int InfoBarDelegate::kNoIconID = 0;
 
 InfoBarDelegate::~InfoBarDelegate() {
 }
 
 InfoBarDelegate::InfoBarAutomationType
     InfoBarDelegate::GetInfoBarAutomationType() const {
   return UNKNOWN_INFOBAR;
 }
 
 bool InfoBarDelegate::EqualsDelegate(InfoBarDelegate* delegate) const {
   return false;
 }
 
-bool InfoBarDelegate::ShouldExpire(
-    const content::LoadCommittedDetails& details) const {
-  if (!details.is_navigation_to_different_page())
+bool InfoBarDelegate::ShouldExpire(const NavigationDetails& details) const {
+  if (!details.is_navigation_to_different_page)
     return false;
 
   return ShouldExpireInternal(details);
 }
 
 void InfoBarDelegate::InfoBarDismissed() {
 }
 
 int InfoBarDelegate::GetIconID() const {
   return kNoIconID;
 }
 
 InfoBarDelegate::Type InfoBarDelegate::GetInfoBarType() const {
   return WARNING_TYPE;
 }
 
+void InfoBarDelegate::CleanUp() {}

[droger, 2014/03/18 15:59:53]

The default implementation of CleanUp does nothing. It's here to be overridden
by subclasses, and most notably ContentConfirmInfoBarDelegate (but also a few
others).

+
 AutoLoginInfoBarDelegate* InfoBarDelegate::AsAutoLoginInfoBarDelegate() {
   return NULL;
 }
 
 ConfirmInfoBarDelegate* InfoBarDelegate::AsConfirmInfoBarDelegate() {
   return NULL;
 }
 
 ExtensionInfoBarDelegate* InfoBarDelegate::AsExtensionInfoBarDelegate() {
   return NULL;
@@ skipping 28 matching lines @@
 }
 
 ThreeDAPIInfoBarDelegate* InfoBarDelegate::AsThreeDAPIInfoBarDelegate() {
   return NULL;
 }
 
 TranslateInfoBarDelegate* InfoBarDelegate::AsTranslateInfoBarDelegate() {
   return NULL;
 }
 
-void InfoBarDelegate::StoreActiveEntryUniqueID() {
-  DCHECK(web_contents());
-  NavigationEntry* active_entry =
-      web_contents()->GetController().GetActiveEntry();
-  contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0;
+void InfoBarDelegate::StoreActiveEntryUniqueID(int entry_id) {
+  contents_unique_id_ = entry_id;
 }
 
 gfx::Image InfoBarDelegate::GetIcon() const {
   int icon_id = GetIconID();
   return (icon_id == kNoIconID) ? gfx::Image() :
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(icon_id);
 }
 
-content::WebContents* InfoBarDelegate::web_contents() {
-  return (infobar_ && infobar_->owner()) ?
-      infobar_->owner()->web_contents() : NULL;
-}
-
 InfoBarDelegate::InfoBarDelegate() : contents_unique_id_(0) {
 }
 
 bool InfoBarDelegate::ShouldExpireInternal(
-    const content::LoadCommittedDetails& details) const {
+    const NavigationDetails& details) const {
   // NOTE: If you change this, be sure to check and adjust the behavior of
   // anyone who overrides this as necessary!
-  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;
 }