Update Chrome Upstream flow to reflect new UI mocks

ui/views/bubble/bubble_frame_view.cc

Index: ui/views/bubble/bubble_frame_view.cc
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc
index 2dd002e5a7192c4fa1d47b4089a66f845eb4c08c..378e42726eb9e2f8a45cb4a47201f6058b6096fb 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -132,7 +132,7 @@ Button* BubbleFrameView::CreateCloseButton(ButtonListener* listener) {
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetContentsBounds();
   client_bounds.Inset(GetInsets());
-  if (footnote_container_) {
+  if (footnote_container_ && footnote_container_->visible()) {
     client_bounds.set_height(client_bounds.height() -
                              footnote_container_->height());
   }
@@ -340,7 +340,7 @@ void BubbleFrameView::Layout() {
   bounds.set_width(title_->bounds().right() - bounds.x());
   bounds.set_height(title_height);
 
-  if (footnote_container_) {
+  if (footnote_container_ && footnote_container_->visible()) {
     const int width = contents_bounds.width();
     const int height = footnote_container_->GetHeightForWidth(width);
     footnote_container_->SetBounds(
@@ -416,6 +416,7 @@ void BubbleFrameView::SetFootnoteView(View* view) {
   footnote_container_->SetBorder(
       CreateSolidSidedBorder(1, 0, 0, 0, kFootnoteBorderColor));
   footnote_container_->AddChildView(view);
+  footnote_container_->SetVisible(view->visible());
   AddChildView(footnote_container_);
 }
 
@@ -541,8 +542,14 @@ gfx::Size BubbleFrameView::GetSizeForClientSize(
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
-  if (footnote_container_)
-    size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
+  if (footnote_container_) {
+    if (footnote_container_->child_count() >= 1) {
+      footnote_container_->SetVisible(
+          footnote_container_->child_at(0)->visible());

[Jared Saul, 2017/06/27 21:52:26]

Note for msw@/tapted@: This changing of the footnote_container_'s visibility
happens inside a const function.  Do you have a better suggestion, or is this
acceptable?  Thanks.

[tapted, 2017/06/27 23:36:15]

We need something added to bubble_frame_view_unittest.cc for this use case

And.. footnote_container_ already has a BoxLayout would should correctly account
for its child view visibility. Is the killer that GetHeightForWidth(..) still
includes |content_margins_| ? Maybe comment about that.

In which case a new View subclass for footnote_container_ like
FootnoteContainerView (e.g. in an anonymous namespace), which has an override of
ChildVisibilityChanged() might be the nicest way to propagate the visibility
"up" to the footnote_container_.

(The pattern is somewhat similar to DialogClientView::ButtonRowContainer in
dialog_client_view.cc )

[Jared Saul, 2017/07/05 19:36:51]

1-Unit test) Added a test
"FootnoteContainerViewShouldMatchVisibilityOfFirstChild".  Any suggestions for
others?  Testing GetBoundsForClientView wasn't useful because
footnote_container_view->height() was 0 even when setting it to
StaticSizedView(gfx::Size(200, 200)), and GetSizeForClientSize was private.

2-Reasoning) Good call!  Yes, that appears to be it.  The extra 27 pixels are
coming from non-child elements at this point:
https://cs.chromium.org/chromium/src/ui/views/layout/box_layout.cc?l=593,598&...
I'll leave comments to that effect.

3-Propagation) Done.  The only snag is that ChildVisibilityChanged doesn't
happen on AddChildView, so I had to make an UpdateVisibility call when the
container is set up, but it's not in the const function anymore so that's good. 
(Thanks so much for including the ButtonRowContainer example; that made it SO
much easier to understand.)

+    }
+    if (footnote_container_->visible())
+      size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
+  }
 
   DialogDelegate* dialog_delegate =
       GetWidget()->widget_delegate()->AsDialogDelegate();