Set Extension Infobars to have a fixed height determined by the developer (clamped to sane min an...

chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc

 // Copyright (c) 2011 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/ui/gtk/infobars/extension_infobar_gtk.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 
 ExtensionInfoBarGtk::ExtensionInfoBarGtk(TabContentsWrapper* owner,
                                          ExtensionInfoBarDelegate* delegate)
     : InfoBarGtk(owner, delegate),
       tracker_(this),
       delegate_(delegate),
       view_(NULL) {
-  delegate_->extension_host()->view()->SetContainer(this);
   BuildWidgets();
 }
 
 ExtensionInfoBarGtk::~ExtensionInfoBarGtk() {
   // This view is not owned by us, so unparent.
   gtk_widget_unparent(view_->native_view());
 }
 
 void ExtensionInfoBarGtk::OnImageLoaded(
     SkBitmap* image, const ExtensionResource& resource, int index) {
@@ skipping 16 matching lines @@
   const Extension* extension = delegate_->extension_host()->extension();
   ExtensionResource icon_resource = extension->GetIconResource(
       Extension::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY);
   if (!icon_resource.relative_path().empty()) {
     // Create a tracker to load the image. It will report back on OnImageLoaded.
     tracker_.LoadImage(extension, icon_resource,
                        gfx::Size(Extension::EXTENSION_ICON_BITTY,
                                  Extension::EXTENSION_ICON_BITTY),
                        ImageLoadingTracker::DONT_CACHE);
   } else {
-    OnImageLoaded(NULL, icon_resource, 0);  // |image|, |index|.
+    OnImageLoaded(NULL, icon_resource, 0);  // |image|, ..., |index|.

[Evan Stade, 2011/08/16 18:35:04]

this comment doesn't really help at all, I'd just delete it

   }
 
   ExtensionHost* extension_host = delegate_->extension_host();
   view_ = extension_host->view();
   if (gtk_widget_get_parent(view_->native_view())) {
     gtk_widget_reparent(view_->native_view(), hbox_);
     gtk_box_set_child_packing(GTK_BOX(hbox_), view_->native_view(),
                               TRUE, TRUE, 0, GTK_PACK_START);
   } else {
     gtk_box_pack_start(GTK_BOX(hbox_), view_->native_view(), TRUE, TRUE, 0);
   }
 
   g_signal_connect(view_->native_view(), "size_allocate",
                    G_CALLBACK(&OnSizeAllocateThunk), this);
 }
 
 void ExtensionInfoBarGtk::OnSizeAllocate(GtkWidget* widget,
                                          GtkAllocation* allocation) {
   gfx::Size new_size(allocation->width, allocation->height);
 
   delegate_->extension_host()->view()->render_view_host()->view()
       ->SetSize(new_size);
 }
 
-void ExtensionInfoBarGtk::OnExtensionPreferredSizeChanged(
-    ExtensionViewGtk* view,
-    const gfx::Size& new_size) {
-  // TODO(rafaelw) - Size the InfobarGtk vertically based on the preferred size
-  // of the content.
-}
-
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
   return new ExtensionInfoBarGtk(owner, this);
 }