Infobar Componentization Proof of Concept

chrome/browser/extensions/extension_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/extensions/extension_infobar_delegate.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 22 matching lines @@
 ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(
     Browser* browser,
     const extensions::Extension* extension,
     const GURL& url,
     content::WebContents* web_contents,
     int height)
     : InfoBarDelegate(),
 #if defined(TOOLKIT_VIEWS)
       browser_(browser),
 #endif
+      web_contents_(web_contents),
       extension_(extension),
       closing_(false) {
   extension_view_host_.reset(
       extensions::ExtensionViewHostFactory::CreateInfobarHost(url, browser));
   extension_view_host_->SetAssociatedWebContents(web_contents);
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(browser->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(browser->profile()));
@@ skipping 29 matching lines @@
 
 InfoBarDelegate::Type ExtensionInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 ExtensionInfoBarDelegate*
     ExtensionInfoBarDelegate::AsExtensionInfoBarDelegate() {
   return this;
 }
 
+void ExtensionInfoBarDelegate::CleanUp() { web_contents_ = NULL; }
+
 void ExtensionInfoBarDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE) {
     if (extension_view_host_.get() ==
         content::Details<extensions::ExtensionHost>(details).ptr())
       infobar()->RemoveSelf();
   } else {
     DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED);
     if (extension_ == content::Details<extensions::UnloadedExtensionInfo>(
         details)->extension)
       infobar()->RemoveSelf();
   }
 }