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

chrome/browser/ui/views/infobars/extension_infobar.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/views/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 24 matching lines @@
 }  // namespace
 
 ExtensionInfoBar::ExtensionInfoBar(TabContentsWrapper* owner,
                                    ExtensionInfoBarDelegate* delegate)
     : InfoBarView(owner, delegate),
       delegate_(delegate),
       menu_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
   delegate->set_observer(this);
 
-  ExtensionView* extension_view = delegate->extension_host()->view();
-  int height = extension_view->GetPreferredSize().height();
+  int height = delegate->height();
   SetBarTargetHeight((height > 0) ? (height + kSeparatorLineHeight) : 0);
-
-  // Get notified of resize events for the ExtensionView.
-  extension_view->SetContainer(this);
 }
 
 ExtensionInfoBar::~ExtensionInfoBar() {
-  if (GetDelegate()) {
-    GetDelegate()->extension_host()->view()->SetContainer(NULL);
+  if (GetDelegate())
     GetDelegate()->set_observer(NULL);
-  }
 }
 
 void ExtensionInfoBar::Layout() {
   InfoBarView::Layout();
 
   gfx::Size menu_size = menu_->GetPreferredSize();
   menu_->SetBounds(StartX(), OffsetY(menu_size), menu_size.width(),
                    menu_size.height());
 
   GetDelegate()->extension_host()->view()->SetBounds(
@@ skipping 34 matching lines @@
         gfx::Size(image_size, image_size), ImageLoadingTracker::DONT_CACHE);
   } else {
     OnImageLoaded(NULL, icon_resource, 0);
   }
 }
 
 int ExtensionInfoBar::ContentMinimumWidth() const {
   return menu_->GetPreferredSize().width() + kMenuHorizontalMargin;
 }
 
-void ExtensionInfoBar::OnExtensionMouseMove(ExtensionView* view) {
-}
-
-void ExtensionInfoBar::OnExtensionMouseLeave(ExtensionView* view) {
-}
-
-void ExtensionInfoBar::OnExtensionPreferredSizeChanged(ExtensionView* view) {
-  ExtensionInfoBarDelegate* delegate = GetDelegate();
-  DCHECK_EQ(delegate->extension_host()->view(), view);
-
-  // When the infobar is closed, it animates to 0 vertical height. We'll
-  // continue to get size changed notifications from the ExtensionView, but we
-  // need to ignore them otherwise we'll try to re-animate open (and leak the
-  // infobar view).
-  if (delegate->closing())
-    return;
-
-  view->SetVisible(true);
-
-  if (height() == 0)
-    animation()->Reset(0.0);
-
-  // Clamp height to a min and a max size of between 1 and 2 InfoBars.
-  SetBarTargetHeight(std::min(2 * kDefaultBarTargetHeight,
-      std::max(kDefaultBarTargetHeight, view->GetPreferredSize().height())));
-
-  animation()->Show();
-}
-
 void ExtensionInfoBar::OnImageLoaded(SkBitmap* image,
                                      const ExtensionResource& resource,
                                      int index) {
   if (!GetDelegate())
     return;  // The delegate can go away while we asynchronously load images.
 
   SkBitmap* icon = image;
   // Fall back on the default extension icon on failure.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (!image || image->empty())
@@ skipping 11 matching lines @@
                         image_size, image_size, false);
   canvas->DrawBitmapInt(*drop_image, image_size + kDropArrowLeftMargin,
                         image_size / 2);
   menu_->SetIcon(canvas->ExtractBitmap());
   menu_->SetVisible(true);
 
   Layout();
 }
 
 void ExtensionInfoBar::OnDelegateDeleted() {
-  GetDelegate()->extension_host()->view()->SetContainer(NULL);
   delegate_ = NULL;
 }
 
 void ExtensionInfoBar::RunMenu(View* source, const gfx::Point& pt) {
   const Extension* extension = GetDelegate()->extension_host()->extension();
   if (!extension->ShowConfigureContextMenus())
     return;
 
   Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
       platform_util::GetTopLevel(source->GetWidget()->GetNativeView()))->
       browser();
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser, NULL);
   views::MenuModelAdapter options_menu_delegate(options_menu_contents.get());
   views::MenuItemView options_menu(&options_menu_delegate);
   options_menu_delegate.BuildMenu(&options_menu);
 
   gfx::Point screen_point;
   views::View::ConvertPointToScreen(menu_, &screen_point);
   options_menu.RunMenuAt(GetWidget(), menu_,
       gfx::Rect(screen_point, menu_->size()), views::MenuItemView::TOPLEFT,
       true);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }