[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);
 }
 
+int InfoBarContainer::VerticalOverlap() const {
+  int temp_total_height;
+  return GetVerticalOverlap(&temp_total_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) {
-  for (int i = 0; i < child_count(); ++i) {
-    InfoBarView* infobar = static_cast<InfoBarView*>(GetChildViewAt(i));
-    infobar->PaintArrow(canvas, outer_view, 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

[Peter Kasting, 2011/03/08 23:21:31]

Nit: I'd move this second sentence to the declaration of GetVerticalOverlap (and
drop the uses of "preferred").

[Sheridan Rawlins, 2011/03/09 00:18:26]

Done.

-  // 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);
+  // of the InfoBars contained within us plus the vertical_overlap.
+  int total_height;
+  GetVerticalOverlap(&total_height);
+  return gfx::Size(0, total_height);
 }
 
 void InfoBarContainer::Layout() {
-  int top = 0;
+  int total_height;
+  int top = GetVerticalOverlap(&total_height);
+
   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();
+    int overlapped_top = top -

[Peter Kasting, 2011/03/08 23:21:31]

Nit: Just use "top -=" here and "top +=" below, and avoid |overlapped_top|.

[Sheridan Rawlins, 2011/03/09 00:18:26]

Done.

+        static_cast<InfoBarView*>(child)->VerticalOverlap();
+    child->SetBounds(0, overlapped_top, width(), ps.height());
+    top = overlapped_top + ps.height();
   }
 }
 
 AccessibilityTypes::Role InfoBarContainer::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_GROUPING;
 }
 
 void InfoBarContainer::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
@@ skipping 14 matching lines @@
       AddInfoBar(infobar_pair->second->CreateInfoBar(), false, WANT_CALLBACK);
       break;
     }
 
     default:
       NOTREACHED();
       break;
   }
 }
 
+int InfoBarContainer::GetVerticalOverlap(int* total_height) const {
+  int minimum_top = 0;

[Peter Kasting, 2011/03/08 23:21:31]

I do not find this algorithm at all comprehensible compared to the one I
suggested, which is not only simpler, but winds up with one fewer total function
on the InfoBarView (because we ditch VerticalOverlap() and make the tab and bar
height accessors public directly).

[Sheridan Rawlins, 2011/03/09 00:18:26]

I think we're going to have to agree to disagree here.  I find it much easier to
conceptualize doing the layout and getting the minimum top.  I really liked the
top -= and top += changes you suggested below and I think they help the
readability.

+  int top = 0;
+
+  for (int i = 0; i < child_count(); ++i) {
+    View* child = const_cast<View*>(GetChildViewAt(i));
+    gfx::Size ps = child->GetPreferredSize();
+    int overlapped_top = top -
+        static_cast<const InfoBarView*>(child)->VerticalOverlap();
+    minimum_top = std::min(minimum_top, overlapped_top);
+    top = overlapped_top + ps.height();
+  }
+
+  DCHECK(total_height);

[Peter Kasting, 2011/03/08 23:21:31]

Your API comments say this can be NULL.  Either make that true or change the
comments.

[Sheridan Rawlins, 2011/03/09 00:18:26]

Done.

+  *total_height = top - minimum_top;
+  return -minimum_top;
+}
+
 void InfoBarContainer::RemoveInfoBar(InfoBarDelegate* delegate,
                                      bool use_animation) {
   // Search for the infobar associated with |delegate|.  We cannot search for
   // |delegate| in |tab_contents_|, because an InfoBar remains alive until its
   // close animation completes, while the delegate is removed from the tab
   // immediately.
   for (InfoBars::iterator i(infobars_.begin()); i != infobars_.end(); ++i) {
     InfoBarView* infobar = *i;
     if (infobar->delegate() == delegate) {
       // We merely need hide the infobar; it will call back to RemoveInfoBar()
       // itself once it's hidden.
       infobar->Hide(use_animation);
       break;
     }
   }
 }
 
 void InfoBarContainer::AddInfoBar(InfoBar* infobar,
                                   bool animate,
                                   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);
 }