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

chrome/browser/ui/views/infobars/infobar_container.h

Index: chrome/browser/ui/views/infobars/infobar_container.h
diff --git a/chrome/browser/ui/views/infobars/infobar_container.h b/chrome/browser/ui/views/infobars/infobar_container.h
index 4dba347b6261997e5a7c862ab004dd73d958ed40..76c593ac111e68e84a023fc3056d325a6c768a68 100644
--- a/chrome/browser/ui/views/infobars/infobar_container.h
+++ b/chrome/browser/ui/views/infobars/infobar_container.h
@@ -37,6 +37,14 @@ class InfoBarContainer : public AccessiblePaneView,
   explicit InfoBarContainer(Delegate* delegate);
   virtual ~InfoBarContainer();
 
+  // AccessiblePaneView:
+  virtual gfx::Size GetPreferredSize();
+
+  // Overlap the previous view by this amount, vertically, so that the
+  // first InfoBarView in this InfoBarContainer may draw its tab on
+  // top.
+  int vertical_overlap() const;

[Peter Kasting, 2011/03/07 20:14:30]

Nit: Use CamelCase because the function implementation is not a cheap inline
accessor.

[Sheridan Rawlins, 2011/03/08 01:38:19]

Done.

+
   // Changes the TabContents for which this container is showing infobars.  This
   // will remove all current infobars from the container, add the infobars from
   // |contents|, and show them all.  |contents| may be NULL.
@@ -57,18 +65,10 @@ class InfoBarContainer : public AccessiblePaneView,
   // hidden.
   void RemoveInfoBar(InfoBarView* infobar);
 
-  // Paint the InfoBar arrows on |canvas|. |arrow_center_x| indicates
-  // the desired location of the center of the arrow in the
-  // |outer_view| coordinate system.
-  void PaintInfoBarArrows(gfx::Canvas* canvas,
-                          View* outer_view,
-                          int arrow_center_x);
-
  private:
   typedef std::set<InfoBarView*> InfoBars;
 
   // AccessiblePaneView:
-  virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual AccessibilityTypes::Role GetAccessibleRole();
 
@@ -77,6 +77,9 @@ class InfoBarContainer : public AccessiblePaneView,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // Several routines need to walk the children for overlap & height info.
+  void LayoutHelper(bool set_bounds, int* vertical_overlap, int* height) const;

[Peter Kasting, 2011/03/07 20:14:30]

Nit: This function should not be marked const, as when |set_bounds| is true it
is not logically const.

[Sheridan Rawlins, 2011/03/08 01:38:19]

Done.

+
   // Removes an InfoBar for the specified delegate, in response to a
   // notification from the selected TabContents. The InfoBar's disappearance
   // will be animated if |use_animation| is true.