Make TabContents own its infobar delegates....

chrome/browser/cocoa/extensions/extension_infobar_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/extensions/extension_infobar_controller.h"
 
 #include <cmath>
 
 #include "app/resource_bundle.h"
 #import "chrome/browser/cocoa/animatable_view.h"
@@ skipping 29 matching lines @@
 - (CGFloat)clampedExtensionViewHeight;
 // Adjusts the width of the extension's hosted view to match the window's width
 // and sets the proper height for it as well.
 - (void)adjustExtensionViewSize;
 // Sets the image to be used in the button on the left side of the infobar.
 - (void)setButtonImage:(NSImage*)image;
 @end
 
 // A helper class to bridge the asynchronous Skia bitmap loading mechanism to
 // the extension's button.
-class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
-                      public ImageLoadingTracker::Observer {
+class InfobarBridge : public ImageLoadingTracker::Observer {
  public:
   explicit InfobarBridge(ExtensionInfoBarController* owner)
       : owner_(owner),
-        delegate_([owner delegate]->AsExtensionInfoBarDelegate()),
         tracker_(this) {
-    delegate_->set_observer(this);
     LoadIcon();
   }
 
   virtual ~InfobarBridge() {
-    if (delegate_)
-      delegate_->set_observer(NULL);
   }
 
   // Load the Extension's icon image.
   void LoadIcon() {
-    const Extension* extension = delegate_->extension_host()->extension();
+    const Extension* extension = [owner_ delegate]->
+        AsExtensionInfoBarDelegate()->extension_host()->extension();
     ExtensionResource icon_resource = extension->GetIconResource(
         Extension::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY);
     if (!icon_resource.relative_path().empty()) {
       tracker_.LoadImage(extension, icon_resource,
                          gfx::Size(Extension::EXTENSION_ICON_BITTY,
                                    Extension::EXTENSION_ICON_BITTY),
                          ImageLoadingTracker::DONT_CACHE);
     } else {
       OnImageLoaded(NULL, icon_resource, 0);
     }
   }
 
   // ImageLoadingTracker::Observer implementation.
   // TODO(andybons): The infobar view implementations share a lot of the same
   // code. Come up with a strategy to share amongst them.
-  virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index) {
-    if (!delegate_)
-      return;  // The delegate can go away while the image asynchronously loads.
-
+  virtual void OnImageLoaded(SkBitmap* image,
+                             ExtensionResource resource,
+                             int index) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     // Fall back on the default extension icon on failure.
     SkBitmap* icon;
     if (!image || image->empty())
       icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
     else
       icon = image;
 
     SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 
     const int image_size = Extension::EXTENSION_ICON_BITTY;
     scoped_ptr<gfx::CanvasSkia> canvas(
         new gfx::CanvasSkia(
             image_size + kDropArrowLeftMarginPx + drop_image->width(),
             image_size, false));
     canvas->DrawBitmapInt(*icon,
                           0, 0, icon->width(), icon->height(),
                           0, 0, image_size, image_size,
                           false);
     canvas->DrawBitmapInt(*drop_image,
                           image_size + kDropArrowLeftMarginPx,
                           image_size / 2);
     [owner_ setButtonImage:gfx::SkBitmapToNSImage(canvas->ExtractBitmap())];
   }
 
-  // Overridden from ExtensionInfoBarDelegate::DelegateObserver:
-  virtual void OnDelegateDeleted() {
-    delegate_ = NULL;
-  }
-
  private:
   // Weak. Owns us.
   ExtensionInfoBarController* owner_;
 
-  // Weak.
-  ExtensionInfoBarDelegate* delegate_;
-
   // Loads the extensions's icon on the file thread.
   ImageLoadingTracker tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(InfobarBridge);
 };
 
 
 @implementation ExtensionInfoBarController
 
 - (id)initWithDelegate:(InfoBarDelegate*)delegate
@@ skipping 120 matching lines @@
 
 @end
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() {
   NSWindow* window = [(NSView*)tab_contents_->GetContentNativeView() window];
   ExtensionInfoBarController* controller =
       [[ExtensionInfoBarController alloc] initWithDelegate:this
                                                     window:window];
   return new InfoBar(controller);
 }