payments dialog: fix legal document preferred size propagation

chrome/browser/ui/views/autofill/autofill_dialog_views.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 "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 293 matching lines @@
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
     bounds_changed_callback_.Run();
   }
 
  private:
   base::Closure bounds_changed_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DetailsContainerView);
 };
 
-// ButtonStripView wraps the Autocheckout progress bar and the "[X] Save details
-// in Chrome" checkbox and listens for visibility changes.
-class ButtonStripView : public views::View {
+// A view that propagates visibility and preferred size changes.
+class LayoutPropagationView : public views::View {
  public:
-  ButtonStripView() {}
-  virtual ~ButtonStripView() {}
+  LayoutPropagationView() {}
+  virtual ~LayoutPropagationView() {}
 
  protected:
   virtual void ChildVisibilityChanged(views::View* child) OVERRIDE {
     PreferredSizeChanged();
   }
+  virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE {
+    PreferredSizeChanged();
+  }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ButtonStripView);
+  DISALLOW_COPY_AND_ASSIGN(LayoutPropagationView);
 };
 
 }  // namespace
 
 // AutofillDialogViews::SizeLimitedScrollView ----------------------------------
 
 AutofillDialogViews::SizeLimitedScrollView::SizeLimitedScrollView(
     views::View* scroll_contents)
     : max_height_(-1) {
   set_hide_horizontal_scrollbar(true);
@@ skipping 872 matching lines @@
 
 views::View* AutofillDialogViews::CreateExtraView() {
   return button_strip_extra_view_;
 }
 
 views::View* AutofillDialogViews::CreateTitlebarExtraView() {
   return account_chooser_;
 }
 
 views::View* AutofillDialogViews::CreateFootnoteView() {
-  footnote_view_ = new views::View();
+  footnote_view_ = new LayoutPropagationView();
   footnote_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical,
                            kLegalDocPadding,
                            kLegalDocPadding,
                            0));
   footnote_view_->set_border(
       views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kSubtleBorderColor));
   footnote_view_->set_background(
       views::Background::CreateSolidBackground(kShadingColor));
 
@@ skipping 131 matching lines @@
   DetailsGroup* group = GroupForView(combobox);
   ValidateGroup(*group, VALIDATE_EDIT);
 }
 
 void AutofillDialogViews::StyledLabelLinkClicked(const ui::Range& range,
                                                  int event_flags) {
   controller_->LegalDocumentLinkClicked(range);
 }
 
 void AutofillDialogViews::InitChildViews() {
-  button_strip_extra_view_ = new ButtonStripView();
+  button_strip_extra_view_ = new LayoutPropagationView();
   button_strip_extra_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
   save_in_chrome_checkbox_ =
       new views::Checkbox(controller_->SaveLocallyText());
   save_in_chrome_checkbox_->SetChecked(true);
   button_strip_extra_view_->AddChildView(save_in_chrome_checkbox_);
 
   autocheckout_progress_bar_view_ = new views::View();
   autocheckout_progress_bar_view_->SetLayoutManager(
@@ skipping 555 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill