Fixing autocheckout progress bar repaint bug.

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/utf_string_conversions.h"
@@ skipping 188 matching lines @@
     views::View::OnPaint(canvas);
     DrawArrow(canvas, width() / 2.0f, color_);
   }
 
  private:
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorBubbleContents);
 };
 
+// ButtonStripView wraps the Autocheckout progress bar and the "[X] Save details
+// in Chrome" checkbox and listens for visibility changes.
+class ButtonStripView : public views::View {
+ public:
+  ButtonStripView() {}
+  virtual ~ButtonStripView() {}
+
+ protected:
+  virtual void ChildVisibilityChanged(views::View* child) OVERRIDE {
+    PreferredSizeChanged();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ButtonStripView);
+};
+
 }  // namespace
 
 // AutofillDialogViews::SizeLimitedScrollView ----------------------------------
 
 AutofillDialogViews::SizeLimitedScrollView::SizeLimitedScrollView(
     views::View* scroll_contents)
     : max_height_(-1) {
   set_hide_horizontal_scrollbar(true);
   SetContents(scroll_contents);
 }
@@ skipping 500 matching lines @@
   decorated_->textfield()->SetIcon(icon);
   decorated_->SetVisible(true);
   // The textfield will increase the height of the first row and cause the
   // label to be aligned properly, so the border is not necessary.
   label_->set_border(NULL);
 }
 
 // AutofilDialogViews::AutocheckoutProgressBar ---------------------------------
 
 AutofillDialogViews::AutocheckoutProgressBar::AutocheckoutProgressBar() {}
+AutofillDialogViews::AutocheckoutProgressBar::~AutocheckoutProgressBar() {}
 
 gfx::Size AutofillDialogViews::AutocheckoutProgressBar::GetPreferredSize() {
   return gfx::Size(kAutocheckoutProgressBarWidth,
                    kAutocheckoutProgressBarHeight);
 }
 
 // AutofillDialogView ----------------------------------------------------------
 
 // static
 AutofillDialogView* AutofillDialogView::Create(
@@ skipping 70 matching lines @@
 void AutofillDialogViews::Hide() {
   if (window_)
     window_->Close();
 }
 
 void AutofillDialogViews::UpdateAccountChooser() {
   account_chooser_->Update();
 
   // Update legal documents for the account.
   if (footnote_view_) {
-    string16 text = controller_->LegalDocumentsText();
-    if (text.empty()) {
-      footnote_view_->SetVisible(false);
-    } else {
-      footnote_view_->SetVisible(true);
-      legal_document_view_->SetText(text);
+    const string16 text = controller_->LegalDocumentsText();
+    legal_document_view_->SetText(text);
 
+    if (!text.empty()) {
       const std::vector<ui::Range>& link_ranges =
           controller_->LegalDocumentLinks();
       for (size_t i = 0; i < link_ranges.size(); ++i) {
         legal_document_view_->AddStyleRange(
             link_ranges[i],
             views::StyledLabel::RangeStyleInfo::CreateForLink());
       }
     }
 
+    footnote_view_->SetVisible(!text.empty());
     ContentsPreferredSizeChanged();
   }
 }
 
 void AutofillDialogViews::UpdateButtonStrip() {
   button_strip_extra_view_->SetVisible(
       GetDialogButtons() != ui::DIALOG_BUTTON_NONE);
   save_in_chrome_checkbox_->SetVisible(!(controller_->AutocheckoutIsRunning() ||
                                          controller_->HadAutocheckoutError()));
   autocheckout_progress_bar_view_->SetVisible(
@@ skipping 329 matching lines @@
   DetailsGroup* group = GroupForView(combobox);
   ValidateGroup(*group, AutofillDialogController::VALIDATE_EDIT);
 }
 
 void AutofillDialogViews::StyledLabelLinkClicked(const ui::Range& range,
                                                  int event_flags) {
   controller_->LegalDocumentLinkClicked(range);
 }
 
 void AutofillDialogViews::InitChildViews() {
-  button_strip_extra_view_ = new views::View();
+  button_strip_extra_view_ = new ButtonStripView();
   button_strip_extra_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
   save_in_chrome_checkbox_ =
       new views::Checkbox(controller_->SaveLocallyText());
   button_strip_extra_view_->AddChildView(save_in_chrome_checkbox_);
 
   autocheckout_progress_bar_view_ = new views::View();
   autocheckout_progress_bar_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
@@ skipping 495 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