Infobar Componentization Proof of Concept

chrome/browser/managed_mode/managed_mode_navigation_observer.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/managed_mode/managed_mode_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/content_confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 47 matching lines @@
     if (browser->tab_strip_model()->count() == 1)
       chrome::NewEmptyWindow(browser->profile(), browser->host_desktop_type());
   }
 
   web_contents->GetDelegate()->CloseContents(web_contents);
 }
 #endif
 
 // ManagedModeWarningInfoBarDelegate ------------------------------------------
 
-class ManagedModeWarningInfoBarDelegate : public ConfirmInfoBarDelegate {
+class ManagedModeWarningInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  public:
   // Creates a managed mode warning infobar and delegate and adds the infobar to
   // |infobar_service|.  Returns the infobar if it was successfully added.
   static InfoBar* Create(InfoBarService* infobar_service);
 
  private:
-  ManagedModeWarningInfoBarDelegate();
+  explicit ManagedModeWarningInfoBarDelegate(
+      content::WebContents* web_contents);
   virtual ~ManagedModeWarningInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual bool ShouldExpire(
-      const content::LoadCommittedDetails& details) const OVERRIDE;
+  virtual bool ShouldExpire(const NavigationDetails& details) const OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual base::string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedModeWarningInfoBarDelegate);
 };
 
 // static
 InfoBar* ManagedModeWarningInfoBarDelegate::Create(
     InfoBarService* infobar_service) {
   return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new ManagedModeWarningInfoBarDelegate())));
+      scoped_ptr<ConfirmInfoBarDelegate>(new ManagedModeWarningInfoBarDelegate(
+          infobar_service->web_contents()))));
 }
 
-ManagedModeWarningInfoBarDelegate::ManagedModeWarningInfoBarDelegate()
-    : ConfirmInfoBarDelegate() {
-}
+ManagedModeWarningInfoBarDelegate::ManagedModeWarningInfoBarDelegate(
+    content::WebContents* web_contents)
+    : ContentConfirmInfoBarDelegate(web_contents) {}
 
 ManagedModeWarningInfoBarDelegate::~ManagedModeWarningInfoBarDelegate() {
 }
 
 bool ManagedModeWarningInfoBarDelegate::ShouldExpire(
-    const content::LoadCommittedDetails& details) const {
+    const NavigationDetails& details) const {
   // ManagedModeNavigationObserver removes us below.
   return false;
 }
 
 void ManagedModeWarningInfoBarDelegate::InfoBarDismissed() {
   ManagedModeNavigationObserver::FromWebContents(
       web_contents())->WarnInfoBarDismissed();
 }
 
 base::string16 ManagedModeWarningInfoBarDelegate::GetMessageText() const {
@@ skipping 50 matching lines @@
 void ManagedModeNavigationObserver::ProvisionalChangeToMainFrameUrl(
     const GURL& url,
     content::RenderFrameHost* render_frame_host) {
   ManagedModeURLFilter::FilteringBehavior behavior =
       url_filter_->GetFilteringBehaviorForURL(url);
 
   if (behavior == ManagedModeURLFilter::WARN || !warn_infobar_)
     return;
 
   // If we shouldn't have a warn infobar remove it here.
-  InfoBarService::FromWebContents(web_contents())->RemoveInfoBar(warn_infobar_);
+  InfoBarService::FromWebContents(web_contents())
+      ->infobar_manager()
+      .RemoveInfoBar(warn_infobar_);
   warn_infobar_ = NULL;
 }
 
 void ManagedModeNavigationObserver::DidCommitProvisionalLoadForFrame(
     int64 frame_id,
     const base::string16& frame_unique_name,
     bool is_main_frame,
     const GURL& url,
     content::PageTransition transition_type,
     content::RenderViewHost* render_view_host) {
@@ skipping 53 matching lines @@
     history_service->AddPage(add_page_args);
 
   scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetVirtualURL(url);
   entry->SetTimestamp(timestamp);
   blocked_navigations_.push_back(entry.release());
   ManagedUserService* managed_user_service =
       ManagedUserServiceFactory::GetForProfile(profile);
   managed_user_service->DidBlockNavigation(web_contents());
 }