Handle expired Autofill credit cards in autofill dialog

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

Index: chrome/browser/ui/views/autofill/autofill_dialog_views.cc
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 7572d874ec3b5f83fbd043375362f3f632677802..a78e1a36e4cced5c8c31d6ba68b77a7319b40d68 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -841,7 +841,7 @@ void AutofillDialogViews::ModelChanged() {
 
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
-    UpdateDetailsGroupState(iter->second);
+    UpdateDetailsGroupState(&iter->second);
   }
 }
 
@@ -1177,7 +1177,7 @@ void AutofillDialogViews::CreateDetailsSection(DialogSection section) {
       controller_->LabelForSection(section),
       inputs_container,
       group->suggested_button);
-  UpdateDetailsGroupState(*group);
+  UpdateDetailsGroupState(group);
 }
 
 views::View* AutofillDialogViews::CreateInputsContainer(DialogSection section) {
@@ -1339,43 +1339,43 @@ void AutofillDialogViews::UpdateSectionImpl(
     }
   }
 
-  UpdateDetailsGroupState(*group);
-  if (group->container && group->container->visible())
-    ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
+  UpdateDetailsGroupState(group);
 }
 
-void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
+void AutofillDialogViews::UpdateDetailsGroupState(DetailsGroup* group) {
   const SuggestionState& suggestion_state =
-      controller_->SuggestionStateForSection(group.section);
+      controller_->SuggestionStateForSection(group->section);
   bool show_suggestions = !suggestion_state.text.empty();
-  group.suggested_info->SetVisible(show_suggestions);
-  group.suggested_info->SetSuggestionText(suggestion_state.text,
-                                          suggestion_state.text_style);
-  group.suggested_info->SetSuggestionIcon(suggestion_state.icon);
-  group.suggested_info->SetEditable(suggestion_state.editable);
+  group->suggested_info->SetVisible(show_suggestions);
+  group->suggested_info->SetSuggestionText(suggestion_state.text,
+                                           suggestion_state.text_style);
+  group->suggested_info->SetSuggestionIcon(suggestion_state.icon);
+  group->suggested_info->SetEditable(suggestion_state.editable);
 
   if (!suggestion_state.extra_text.empty()) {
-    group.suggested_info->ShowTextfield(
+    group->suggested_info->ShowTextfield(
         suggestion_state.extra_text,
         suggestion_state.extra_icon.AsImageSkia());
   }
 
-  group.manual_input->SetVisible(!show_suggestions);
+  group->manual_input->SetVisible(!show_suggestions);
 
   // Show or hide the "Save in chrome" checkbox. If nothing is in editing mode,
   // hide. If the controller tells us not to show it, likewise hide.
   save_in_chrome_checkbox_->SetVisible(
       controller_->ShouldOfferToSaveInChrome());
 
-  const bool has_suggestions =
-      controller_->MenuModelForSection(group.section)->GetItemCount() > 0;
+  const bool has_menu =
+      controller_->MenuModelForSection(group->section)->GetItemCount() > 0;
 
-  if (group.suggested_button)
-    group.suggested_button->SetVisible(has_suggestions);
+  if (group->suggested_button)
+    group->suggested_button->SetVisible(has_menu);
 
-  if (group.container) {
-    group.container->SetForwardMouseEvents(has_suggestions && show_suggestions);
-    group.container->SetVisible(controller_->SectionIsActive(group.section));
+  if (group->container) {
+    group->container->SetForwardMouseEvents(has_menu && show_suggestions);
+    group->container->SetVisible(controller_->SectionIsActive(group->section));
+    if (group->container->visible())
+      ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
   }
 
   ContentsPreferredSizeChanged();