[linux_views][Win] spoof proof redesign infobar extension with tab.

chrome/browser/ui/views/infobars/infobar_container.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/infobar_container.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/infobars/infobar_view.h"
@@ skipping 15 matching lines @@
 
 InfoBarContainer::~InfoBarContainer() {
   // Before we remove any children, we reset |delegate_|, so that no removals
   // will result in us trying to call delegate_->InfoBarContainerSizeChanged().
   // This is important because at this point |delegate_| may be shutting down,
   // and it's at best unimportant and at worst disastrous to call that.
   delegate_ = NULL;
   ChangeTabContents(NULL);
 }
 
+InfoBarContainer::Heights InfoBarContainer::GetHeights() const {
+  int offset = 0;
+  int bar_height = 0;
+  for (int i = 0; i < child_count(); ++i) {
+    const InfoBarView* infobar =
+        static_cast<const InfoBarView*>(GetChildViewAt(i));
+    offset = std::min(offset, bar_height - infobar->preferred_tab_height());
+    bar_height += infobar->preferred_bar_height();
+  }
+  return Heights(-offset, bar_height);
+}
+
 void InfoBarContainer::ChangeTabContents(TabContents* contents) {
   registrar_.RemoveAll();
 
   while (!infobars_.empty()) {
     InfoBarView* infobar = *infobars_.begin();
     // NULL the container pointer first so OnInfoBarAnimated() won't get called;
     // we'll manually trigger this once for the whole set of changes below.
     infobar->set_container(NULL);
     RemoveInfoBar(infobar);
   }
@@ skipping 27 matching lines @@
 
 void InfoBarContainer::RemoveDelegate(InfoBarDelegate* delegate) {
   tab_contents_->RemoveInfoBar(delegate);
 }
 
 void InfoBarContainer::RemoveInfoBar(InfoBarView* infobar) {
   RemoveChildView(infobar);
   infobars_.erase(infobar);
 }
 
-void InfoBarContainer::PaintInfoBarArrows(gfx::Canvas* canvas,
-                                          View* outer_view,
-                                          int arrow_center_x) {
+gfx::Size InfoBarContainer::GetPreferredSize() {
+  // We do not have a preferred width (we will expand to fit the
+  // available width of the delegate). Our preferred height is the sum
+  // of the preferred heights of the InfoBars contained within us and
+  // the tab_height.
+  return gfx::Size(0, GetHeights().height());
+}
+
+void InfoBarContainer::Layout() {
+  // Because multiple infobars may be animating, the tab of a
+  // vertically lower bar may be "higher".  Get the overall heights of
+  // this InfoBarContainer before laying out.
+  Heights heights = GetHeights();
+
+  int top = heights.tab_height();
   for (int i = 0; i < child_count(); ++i) {
-    InfoBarView* infobar = static_cast<InfoBarView*>(GetChildViewAt(i));
-    infobar->PaintArrow(canvas, outer_view, arrow_center_x);
+    View* child = GetChildViewAt(i);
+    InfoBarView* infobar = static_cast<InfoBarView*>(child);
+    gfx::Size ps = child->GetPreferredSize();
+    child->SetBounds(0, top - infobar->preferred_tab_height(),
+                     width(), ps.height());
+    top += infobar->preferred_bar_height();
   }
 }
 
-gfx::Size InfoBarContainer::GetPreferredSize() {
-  // We do not have a preferred width (we will expand to fit the available width
-  // of the delegate). Our preferred height is the sum of the preferred heights
-  // of the InfoBars contained within us.
-  int height = 0;
-  for (int i = 0; i < child_count(); ++i)
-    height += GetChildViewAt(i)->GetPreferredSize().height();
-  return gfx::Size(0, height);
-}
-
-void InfoBarContainer::Layout() {
-  int top = 0;
-  for (int i = 0; i < child_count(); ++i) {
-    View* child = GetChildViewAt(i);
-    gfx::Size ps = child->GetPreferredSize();
-    child->SetBounds(0, top, width(), ps.height());
-    top += ps.height();
-  }
-}
-
 void InfoBarContainer::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER);
 }
 
 void InfoBarContainer::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::TAB_CONTENTS_INFOBAR_ADDED:
@@ skipping 41 matching lines @@
                                   CallbackStatus callback_status) {
   InfoBarView* infobar_view = static_cast<InfoBarView*>(infobar);
   infobars_.insert(infobar_view);
   AddChildView(infobar_view);
   if (callback_status == WANT_CALLBACK)
     infobar_view->set_container(this);
   infobar_view->Show(animate);
   if (callback_status == NO_CALLBACK)
     infobar_view->set_container(this);
 }