Handle expired Autofill credit cards in autofill dialog

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 821 matching lines @@
   ContentsPreferredSizeChanged();
 }
 
 void AutofillDialogViews::UpdateProgressBar(double value) {
   autocheckout_progress_bar_->SetValue(value);
 }
 
 void AutofillDialogViews::ModelChanged() {
   menu_runner_.reset();
 
-  for (DetailGroupMap::iterator iter = detail_groups_.begin();
+  for (DetailGroupMap::const_iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     UpdateDetailsGroupState(iter->second);
   }
 }
 
 TestableAutofillDialogView* AutofillDialogViews::GetTestableView() {
   return this;
 }
 
 void AutofillDialogViews::SubmitForTesting() {
@@ skipping 205 matching lines @@
 
 void AutofillDialogViews::OnDidChangeFocus(
     views::View* focused_before,
     views::View* focused_now) {
   if (!focused_before)
     return;
 
   // If user leaves an edit-field, revalidate the group it belongs to.
   DetailsGroup* group = GroupForView(focused_before);
   if (group && group->container->visible())
-    ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
+    ValidateGroup(*group, AutofillDialogController::VALIDATE_EDIT);
 }
 
 void AutofillDialogViews::LinkClicked(views::Link* source, int event_flags) {
   // Edit links.
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     if (iter->second.suggested_info->Contains(source)) {
       controller_->EditClickedForSection(iter->first);
       return;
     }
   }
 }
 
 void AutofillDialogViews::OnSelectedIndexChanged(views::Combobox* combobox) {
   DetailsGroup* group = GroupForView(combobox);
   DCHECK(group);

[Evan Stade, 2013/05/01 21:54:31]

no longer need the dcheck since you deref, err, "indirect", right away

[Dan Beam, 2013/05/02 00:03:31]

Done.

-  ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
+  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_->SetLayoutManager(
@@ skipping 237 matching lines @@
       for (int i = 0; i < combobox->model()->GetItemCount(); ++i) {
         if (input.initial_value == combobox->model()->GetItemAt(i)) {
           combobox->SetSelectedIndex(i);
           break;
         }
       }
     }
   }
 
   UpdateDetailsGroupState(*group);
-  if (group->container && group->container->visible())
-    ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
 }
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
   const SuggestionState& suggestion_state =
       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);
@@ skipping 14 matching lines @@
 
   const bool has_suggestions =
       controller_->MenuModelForSection(group.section)->GetItemCount() > 0;
 
   if (group.suggested_button)
     group.suggested_button->SetVisible(has_suggestions);
 
   if (group.container) {
     group.container->SetForwardMouseEvents(has_suggestions && show_suggestions);
     group.container->SetVisible(controller_->SectionIsActive(group.section));
+    if (group.container->visible())
+      ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
   }
 
   ContentsPreferredSizeChanged();
 }
 
 bool AutofillDialogViews::ValidateGroup(
-    DetailsGroup* group,
+    const DetailsGroup& group,
     AutofillDialogController::ValidationType validation_type) {
-  DCHECK(group->container->visible());
+  DCHECK(group.container->visible());
 
   scoped_ptr<DetailInput> cvc_input;
   DetailOutputMap detail_outputs;
   std::map<AutofillFieldType, base::Callback<void(bool)> > field_map;
 
-  if (group->manual_input->visible()) {
-    for (TextfieldMap::iterator iter = group->textfields.begin();
-         iter != group->textfields.end(); ++iter) {
+  if (group.manual_input->visible()) {
+    for (TextfieldMap::const_iterator iter = group.textfields.begin();
+         iter != group.textfields.end(); ++iter) {
       detail_outputs[iter->first] = iter->second->textfield()->text();
       field_map[iter->first->type] =
           base::Bind(&DecoratedTextfield::SetInvalid,
                      base::Unretained(iter->second));
     }
-    for (ComboboxMap::iterator iter = group->comboboxes.begin();
-         iter != group->comboboxes.end(); ++iter) {
+    for (ComboboxMap::const_iterator iter = group.comboboxes.begin();
+         iter != group.comboboxes.end(); ++iter) {
       views::Combobox* combobox = iter->second;
       string16 item =
           combobox->model()->GetItemAt(combobox->selected_index());
       detail_outputs[iter->first] = item;
       field_map[iter->first->type] =
           base::Bind(&views::Combobox::SetInvalid,
                      base::Unretained(iter->second));
     }
-  } else if (group->section == SECTION_CC) {
+  } else if (group.section == SECTION_CC) {
     DecoratedTextfield* decorated_cvc =
-        group->suggested_info->decorated_textfield();
+        group.suggested_info->decorated_textfield();
     cvc_input.reset(new DetailInput);
     cvc_input->type = CREDIT_CARD_VERIFICATION_CODE;
     detail_outputs[cvc_input.get()] = decorated_cvc->textfield()->text();
     field_map[cvc_input->type] =
         base::Bind(&DecoratedTextfield::SetInvalid,
                    base::Unretained(decorated_cvc));
   }
 
   std::vector<AutofillFieldType> invalid_inputs;
   invalid_inputs = controller_->InputsAreValid(detail_outputs, validation_type);
@@ skipping 10 matching lines @@
     iter->second.Run(false);  // Calls SetInvalid(false) for this field.
   }
 
   return invalid_inputs.empty();
 }
 
 bool AutofillDialogViews::ValidateForm() {
   bool all_valid = true;
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
-    DetailsGroup* group = &iter->second;
-    if (!group->container->visible())
+    const DetailsGroup& group = iter->second;
+    if (!group.container->visible())
       continue;
 
     if (!ValidateGroup(group, AutofillDialogController::VALIDATE_FINAL))
       all_valid = false;
   }
 
   return all_valid;
 }
 
 void AutofillDialogViews::TextfieldEditedOrActivated(
@@ skipping 34 matching lines @@
   // Many fields (i.e. CC#) are invalid for most of the duration of editing,
   // so flagging them as invalid prematurely is not helpful. However,
   // correcting a minor mistake (i.e. a wrong CC digit) should immediately
   // result in validation - positive user feedback.
   if (decorated->invalid() && was_edit) {
     decorated->SetInvalid(!controller_->InputIsValid(type, textfield->text()));
 
     // If the field transitioned from invalid to valid, re-validate the group,
     // since inter-field checks become meaningful with valid fields.
     if (!decorated->invalid())
-      ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
+      ValidateGroup(*group, AutofillDialogController::VALIDATE_EDIT);
   }
 
   gfx::Image icon = controller_->IconForField(type, textfield->text());
   textfield->SetIcon(icon.AsImageSkia());
 }
 
 void AutofillDialogViews::ContentsPreferredSizeChanged() {
   if (GetWidget()) {
     GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
     // If the above line does not cause the dialog's size to change, |contents_|
@@ skipping 62 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