[MD] Fix clipping of infobar child elements (particularly close button).

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

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "components/infobars/core/infobar.h"
@@ skipping 74 matching lines @@
   // Returns the minimum width the content (that is, everything between the icon
   // and the close button) can be shrunk to.  This is used to prevent the close
   // button from overlapping views that cannot be shrunk any further.
   virtual int ContentMinimumWidth() const;
 
   // These return x coordinates delimiting the usable area for subclasses to lay
   // out their controls.
   int StartX() const;
   int EndX() const;
 
-  // Given a |view|, returns the centered y position within us, taking into
-  // account animation so the control "slides in" (or out) as we animate open
-  // and closed.
+  // Given a |view|, returns the centered y position within |child_container_|,
+  // taking into account animation so the control "slides in" (or out) as we
+  // animate open and closed.
   int OffsetY(views::View* view) const;
 
   // Convenience getter.
   const infobars::InfoBarContainer::Delegate* container_delegate() const;
 
   // Shows a menu at the specified position.
   // NOTE: This must not be called if we're unowned.  (Subclasses should ignore
   // calls to RunMenu() in this case.)
   void RunMenuAt(ui::MenuModel* menu_model,
                  views::MenuButton* button,
                  views::MenuAnchorPosition anchor);
 
+ protected:
+  // Adds |view| to the content area, i.e. |child_container_|. The |view| won't
+  // automatically get any layout, so should still be laid out manually.
+  void AddViewToContentArea(views::View* view);
+
  private:
   // Does the actual work for AssignWidths().  Assumes |labels| is sorted by
   // decreasing preferred width.
   static void AssignWidthsSorted(Labels* labels, int available_width);
 
   // InfoBar:
   void PlatformSpecificShow(bool animate) override;
   void PlatformSpecificHide(bool animate) override;
   void PlatformSpecificOnHeightsRecalculated() override;
 
   // views::View:
   void GetAccessibleState(ui::AXViewState* state) override;
   gfx::Size GetPreferredSize() const override;
-  void PaintChildren(const ui::PaintContext& context) override;
 
   // views::ExternalFocusTracker:
   void OnWillChangeFocus(View* focused_before, View* focused_now) override;
 
+  // This container holds the children and clips their painting during
+  // animation.
+  views::View* child_container_;
+
   // The optional icon at the left edge of the InfoBar.
   views::ImageView* icon_;
 
   // The close button at the right edge of the InfoBar.
   views::ImageButton* close_button_;
 
   // The paths for the InfoBarBackground to draw, sized according to the heights
   // above.
   SkPath fill_path_;
   SkPath stroke_path_;
 
   // Used to run the menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_