Update Chrome Upstream flow to reflect new UI mocks

ui/views/bubble/bubble_frame_view.cc

 // 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.
 
 #include "ui/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 54 matching lines @@
   //  +---------------------------------+
   if (vertical)
     return std::max(0, available_bounds.y() - window_bounds.y()) +
            std::max(0, window_bounds.bottom() - available_bounds.bottom());
   return std::max(0, available_bounds.x() - window_bounds.x()) +
          std::max(0, window_bounds.right() - available_bounds.right());
 }
 
 }  // namespace
 
+// A container that changes visibility with its contents.
+class FootnoteContainerView : public View {
+ public:
+  FootnoteContainerView() {}
+
+  // View:
+  void ChildVisibilityChanged(View* child) override {
+    DCHECK(child_count() >= 1);

[tapted, 2017/07/10 03:52:05]

nit: Is there a reason to use >= rather than == ? The former suggests there
might be more complexity than there actually is, which can confuse readers. E.g.
If there _were_ more child views, it would be important to communicate that only
the first view is responsible for controlling the visibility of the footnote.

Whereas,

DCHECK_EQ(child_count(), 1);
SetVisible(child->visible());

makes it clear that there is always exactly one child view, so it must be the
|child| view that's being passed in -- i.e. the one that is actually changing
its visibility

[Jared Saul, 2017/07/10 19:24:40]

No big reason; just an abundance of caution in case I misunderstood how footnote
views work.  And using child_at(0) instead of |child| was just an oversight.

Changed; thanks for catching!

+    SetVisible(child_at(0)->visible());
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FootnoteContainerView);
+};
+
 // static
 const char BubbleFrameView::kViewClassName[] = "BubbleFrameView";
 
 BubbleFrameView::BubbleFrameView(const gfx::Insets& title_margins,
                                  const gfx::Insets& content_margins)
     : bubble_border_(nullptr),
       title_margins_(title_margins),
       content_margins_(content_margins),
       title_icon_(new views::ImageView()),
       title_(nullptr),
@@ skipping 40 matching lines @@
         *rb->GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
   }
   close_button->SetTooltipText(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
   close_button->SizeToPreferredSize();
   return close_button;
 }
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetContentsBounds();
   client_bounds.Inset(GetInsets());
-  if (footnote_container_) {
+  // Only account for footnote_container_'s height if it's visible, because
+  // content_margins_ adds extra padding even if all child views are invisible.
+  if (footnote_container_ && footnote_container_->visible()) {
     client_bounds.set_height(client_bounds.height() -
                              footnote_container_->height());
   }
   return client_bounds;
 }
 
 gfx::Rect BubbleFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Size size(GetSizeForClientSize(client_bounds.size()));
   return bubble_border_->GetBounds(gfx::Rect(), size);
@@ skipping 187 matching lines @@
     title_height = std::max(title_height, title_->height());
     title_->SetPosition(gfx::Point(
         title_label_x, bounds.y() + (title_height - title_->height()) / 2));
   }
 
   title_icon_->SetBounds(bounds.x(), bounds.y(), title_icon_pref_size.width(),
                          title_height);
   bounds.set_width(title_->bounds().right() - bounds.x());
   bounds.set_height(title_height);
 
-  if (footnote_container_) {
+  // Only account for footnote_container_'s height if it's visible, because
+  // content_margins_ adds extra padding even if all child views are invisible.
+  if (footnote_container_ && footnote_container_->visible()) {
     const int width = contents_bounds.width();
     const int height = footnote_container_->GetHeightForWidth(width);
     footnote_container_->SetBounds(
         contents_bounds.x(), contents_bounds.bottom() - height, width, height);
   }
 }
 
 void BubbleFrameView::OnThemeChanged() {
   UpdateWindowTitle();
   ResetWindowControls();
@@ skipping 47 matching lines @@
 
   // Update the background, which relies on the border.
   SetBackground(base::MakeUnique<views::BubbleBackground>(bubble_border_));
 }
 
 void BubbleFrameView::SetFootnoteView(View* view) {
   if (!view)
     return;
 
   DCHECK(!footnote_container_);
-  footnote_container_ = new views::View();
-  footnote_container_->SetLayoutManager(
+  FootnoteContainerView* footnote_container = new FootnoteContainerView();
+  footnote_container->SetLayoutManager(
       new BoxLayout(BoxLayout::kVertical, content_margins_, 0));
-  footnote_container_->SetBackground(
+  footnote_container->SetBackground(
       CreateSolidBackground(kFootnoteBackgroundColor));
-  footnote_container_->SetBorder(
+  footnote_container->SetBorder(
       CreateSolidSidedBorder(1, 0, 0, 0, kFootnoteBorderColor));
-  footnote_container_->AddChildView(view);
-  AddChildView(footnote_container_);
+  footnote_container->AddChildView(view);
+  footnote_container->SetVisible(view->visible());

[tapted, 2017/07/10 03:52:05]

Using SetVisible (rather than UpdateVisibility), means you no longer need the
concrete type (you just need View*), so I'd go back to just assigning to
|footnote_container_| directly.  (sorry - I gave you too many options!)

[Jared Saul, 2017/07/10 19:24:40]

np, done.

+  AddChildView(footnote_container);
+  footnote_container_ = footnote_container;
 }
 
 gfx::Rect BubbleFrameView::GetUpdatedWindowBounds(const gfx::Rect& anchor_rect,
                                                   const gfx::Size& client_size,
                                                   bool adjust_if_offscreen) {
   gfx::Size size(GetSizeForClientSize(client_size));
 
   const BubbleBorder::Arrow arrow = bubble_border_->arrow();
   if (adjust_if_offscreen && BubbleBorder::has_arrow(arrow)) {
     // Try to mirror the anchoring if the bubble does not fit on the screen.
@@ skipping 104 matching lines @@
     title_bar_width += title_margins_.left();
   title_bar_width += title_icon_size.width();
   if (close_->visible())
     title_bar_width += close_->width() + 1;
 
   gfx::Size size(client_size);
   gfx::Insets client_insets = GetInsets();
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
-  if (footnote_container_)
+  // Only account for footnote_container_'s height if it's visible, because
+  // content_margins_ adds extra padding even if all child views are invisible.
+  if (footnote_container_ && footnote_container_->visible())
     size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
 
   DialogDelegate* dialog_delegate =
       GetWidget()->widget_delegate()->AsDialogDelegate();
   if (dialog_delegate && dialog_delegate->ShouldSnapFrameWidth())
     size.set_width(LayoutProvider::Get()->GetSnappedDialogWidth(size.width()));
 
   return size;
 }
 
 }  // namespace views