Interactive autofill: Adds footnote view to accept legal documents in the UI.

ui/views/window/dialog_client_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/window/dialog_client_view.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 353 matching lines @@
       if (cancel_button_ || ok_button_)
         width += style_params_.related_button_hspacing;
     }
     if (width > 0) {
       width += 2 * style_params_.button_hedge_margin;
       prefsize.set_width(std::max(prefsize.width(), width));
     }
   }
   prefsize.Enlarge(0, button_height);
 
-  if (footnote_view_) {
-    gfx::Size footnote_size = footnote_view_->GetPreferredSize();
-    prefsize.Enlarge(0, footnote_size.height());
-    prefsize.set_width(std::max(prefsize.width(), footnote_size.width()));
-  }
+  const gfx::Size& footnote_size = GetFootnoteSize();
+  prefsize.Enlarge(0, footnote_size.height());
+  prefsize.set_width(std::max(prefsize.width(), footnote_size.width()));
 
   return prefsize;
 }
 
 bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // We only expect Escape key.
   DCHECK(accelerator.key_code() == ui::VKEY_ESCAPE);
   Close();
   return true;
 }
@@ skipping 97 matching lines @@
                              ok_button_->GetPreferredSize().height());
   return button_height;
 }
 
 int DialogClientView::GetDialogButtonsAreaHeight() const {
   return !has_dialog_buttons() ? 0 :
       GetButtonsHeight() + style_params_.button_content_spacing +
       style_params_.button_vedge_margin;
 }
 
-int DialogClientView::GetFootnoteViewHeight() const {
-  return footnote_view_ ? footnote_view_->GetPreferredSize().height() : 0;
+gfx::Size DialogClientView::GetFootnoteSize() const {
+  return footnote_view_ && footnote_view_->visible() ?
+      footnote_view_->GetPreferredSize() : gfx::Size();
 }
 
 void DialogClientView::LayoutDialogButtons() {
   gfx::Rect lb = GetContentsBounds();
   gfx::Rect extra_bounds;
   int bottom_y = lb.bottom() - style_params_.button_vedge_margin;
-  if (footnote_view_)
-    bottom_y -= footnote_view_->GetPreferredSize().height();
+  bottom_y -= GetFootnoteSize().height();
 
   int button_height = GetButtonsHeight();
   if (cancel_button_) {
     gfx::Size ps = cancel_button_->GetPreferredSize();
     int button_x = lb.right() - ps.width() - style_params_.button_hedge_margin;
     int button_y = bottom_y - ps.height();
     cancel_button_->SetBounds(button_x, button_y, ps.width(), ps.height());
     // The extra view bounds are dependent on this button.
     extra_bounds.set_width(std::max(0, cancel_button_->x()));
     extra_bounds.set_y(cancel_button_->y());
@@ skipping 18 matching lines @@
     int height = size_extra_view_height_to_buttons_ ?
         std::max(ps.height(), button_height) : ps.height();
     extra_bounds.set_height(height);
     extra_view_->SetBoundsRect(extra_bounds);
   }
 }
 
 void DialogClientView::LayoutContentsView() {
   gfx::Rect lb = GetContentsBounds();
   lb.set_height(std::max(0, lb.height() - GetDialogButtonsAreaHeight() -
-                            GetFootnoteViewHeight()));
+                            GetFootnoteSize().height()));
   contents_view()->SetBoundsRect(lb);
   contents_view()->Layout();
 }
 
 void DialogClientView::LayoutFootnoteView() {
-  int height = GetFootnoteViewHeight();
+  int height = GetFootnoteSize().height();
   gfx::Rect bounds = GetContentsBounds();
   bounds.set_y(bounds.height() - height);
   bounds.set_height(height);
   footnote_view_->SetBoundsRect(bounds);
   footnote_view_->Layout();
 }
 
 void DialogClientView::CreateExtraView() {
   View* extra_view = GetDialogDelegate()->GetExtraView();
   if (extra_view && !extra_view_) {
@@ skipping 39 matching lines @@
   }
   saved_focus_manager_ = focus_manager;
   // Listen for focus change events so we can update the default button.
   if (focus_manager) {
     focus_manager->AddFocusChangeListener(this);
     listening_to_focus_ = true;
   }
 }
 
 }  // namespace views