Handle expired Autofill credit cards in autofill dialog

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 369 matching lines @@
   view_.reset(CreateView());
   view_->Show();
   GetManager()->AddObserver(this);
 
   // Try to see if the user is already signed-in.
   // If signed-in, fetch the user's Wallet data.
   // Otherwise, see if the user could be signed in passively.
   // TODO(aruslan): UMA metrics for sign-in.
   if (account_chooser_model_.WalletIsSelected())
     GetWalletItems();
+
+  // Some suggestions may be invalid to start. Run |SuggestionItemSelected()|
+  // for each section to make sure the edit UI is shown for these suggestions.
+  for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
+    DialogSection section = static_cast<DialogSection>(i);
+    SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
+    if (IsASuggestionItemKey(model->GetItemKeyForCheckedItem()))
+      SuggestionItemSelected(model, model->checked_item());
+  }
 }
 
 void AutofillDialogControllerImpl::Hide() {
   if (view_)
     view_->Hide();
 }
 
 void AutofillDialogControllerImpl::UpdateProgressBar(double value) {
   view_->UpdateProgressBar(value);
 }
@@ skipping 225 matching lines @@
         link_start, link_start + documents[i]->display_name().size()));
   }
   legal_documents_text_ = text;
 }
 
 void AutofillDialogControllerImpl::ResetManualInputForSection(
     DialogSection section) {
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   for (size_t i = 0; i < inputs->size(); ++i)
     (*inputs)[i].initial_value.clear();
+  // TODO(dbeam): why is this here rather than in EditCancelledForSection()?
   section_editing_state_[section] = false;
 }
 
 const DetailInputs& AutofillDialogControllerImpl::RequestedFieldsForSection(
     DialogSection section) const {
   switch (section) {
     case SECTION_EMAIL:
       return requested_email_fields_;
     case SECTION_CC:
       return requested_cc_fields_;
@@ skipping 85 matching lines @@
                          ExtraSuggestionIconForSection(section),
                          EditEnabledForSection(section));
 }
 
 string16 AutofillDialogControllerImpl::SuggestionTextForSection(
     DialogSection section) {
   string16 action_text = RequiredActionTextForSection(section);
   if (!action_text.empty())
     return action_text;
 
-  // When the user has clicked 'edit', don't show a suggestion (even though
-  // there is a profile selected in the model).
+  // When the user has clicked 'edit' or a suggestion is somehow invalid (e.g. a
+  // user selects a credit card that has expired), don't show a suggestion (even
+  // though there is a profile selected in the model).
   if (section_editing_state_[section])
     return string16();
 
   SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
   std::string item_key = model->GetItemKeyForCheckedItem();
   if (item_key == kSameAsBillingKey) {
     return l10n_util::GetStringUTF16(
         IDS_AUTOFILL_DIALOG_USING_BILLING_FOR_SHIPPING);
   }
 
   if (!IsASuggestionItemKey(item_key))
     return string16();
 
   if (section == SECTION_EMAIL)
     return model->GetLabelAt(model->checked_item());
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
-  return wrapper->GetDisplayText();
+  return wrapper->IsValid() ? wrapper->GetDisplayText() : string16();
 }
 
 gfx::Font::FontStyle
     AutofillDialogControllerImpl::SuggestionTextStyleForSection(
         DialogSection section) const {
   const SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
   if (model->GetItemKeyForCheckedItem() == kSameAsBillingKey)
     return gfx::Font::ITALIC;
 
   return gfx::Font::NORMAL;
@@ skipping 112 matching lines @@
   }
 
   if (section == SECTION_CC_BILLING && IsSubmitPausedOn(wallet::VERIFY_CVV))
     return false;
 
   return true;
 }
 
 void AutofillDialogControllerImpl::EditClickedForSection(
     DialogSection section) {
-  DetailInputs* inputs = MutableRequestedFieldsForSection(section);
-  scoped_ptr<DataModelWrapper> model = CreateWrapper(section);
-  model->FillInputs(inputs);
+  ShowEditingMode(section);
+  GetMetricLogger().LogDialogUiEvent(
+      dialog_type_, DialogSectionToUiEditEvent(section));
+}
+
+void AutofillDialogControllerImpl::ShowEditingMode(DialogSection section) {

[Evan Stade, 2013/04/24 22:00:17]

make functions match header order

[Dan Beam, 2013/04/26 02:11:32]

Done.

+  scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
+  wrapper->FillInputs(MutableRequestedFieldsForSection(section));
   section_editing_state_[section] = true;
   view_->UpdateSection(section);
-
-  GetMetricLogger().LogDialogUiEvent(
-      dialog_type_, DialogSectionToUiEditEvent(section));
 }
 
 void AutofillDialogControllerImpl::EditCancelledForSection(
     DialogSection section) {
   ResetManualInputForSection(section);
   view_->UpdateSection(section);
 }
 
 gfx::Image AutofillDialogControllerImpl::IconForField(
     AutofillFieldType type, const string16& user_input) const {
@@ skipping 467 matching lines @@
 
 void AutofillDialogControllerImpl::SuggestionItemSelected(
     SuggestionsMenuModel* model,
     size_t index) {
   if (model->GetItemKeyAt(index) == kManageItemsKey) {
     // TODO(estade): show chrome://settings or a wallet URL.
     return;
   }
 
   model->SetCheckedIndex(index);
-  EditCancelledForSection(SectionForSuggestionsMenuModel(*model));
+
+  const DialogSection section = SectionForSuggestionsMenuModel(*model);
+  if (IsASuggestionItemKey(model->GetItemKeyForCheckedItem()) &&

[Evan Stade, 2013/04/24 22:00:17]

I can't for the life of me figure out what this is doing, so a comment here
would be useful.

[Dan Beam, 2013/04/26 02:11:32]

Done.

+      SuggestionTextForSection(section).empty()) {
+    ResetManualInputForSection(section);
+    ShowEditingMode(section);
+  } else {
+    EditCancelledForSection(section);
+  }
 
   LogSuggestionItemSelectedMetric(*model);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // wallet::WalletClientDelegate implementation.
 
 const AutofillMetrics& AutofillDialogControllerImpl::GetMetricLogger() const {
   return metric_logger_;
 }
@@ skipping 157 matching lines @@
 
 void AutofillDialogControllerImpl::OnPersonalDataChanged() {
   SuggestionsUpdated();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AccountChooserModelDelegate implementation.
 
 void AutofillDialogControllerImpl::AccountChoiceChanged() {
   // Whenever the user changes the account, all manual inputs should be reset.
-  ResetManualInputForSection(SECTION_EMAIL);
-  ResetManualInputForSection(SECTION_CC);
-  ResetManualInputForSection(SECTION_BILLING);
-  ResetManualInputForSection(SECTION_CC_BILLING);
-  ResetManualInputForSection(SECTION_SHIPPING);
+  for (size_t section = SECTION_MIN; section <= SECTION_MAX; ++section) {
+    ResetManualInputForSection(static_cast<DialogSection>(section));
+  }
 
   if (is_submitting_)
     GetWalletClient()->CancelRequests();
 
   SetIsSubmitting(false);
 
   if (!signin_helper_ && account_chooser_model_.WalletIsSelected()) {
     if (account_chooser_model_.IsActiveWalletAccountSelected()) {
       // If the user has chosen an already active Wallet account, and we don't
       // have the Wallet items, an attempt to fetch the Wallet data is made to
@@ skipping 135 matching lines @@
     }
 
     const std::vector<wallet::Address*>& addresses =
         wallet_items_->addresses();
     for (size_t i = 0; i < addresses.size(); ++i) {
       // TODO(dbeam): respect the default instrument ID. http://crbug.com/232954
       suggested_shipping_.AddKeyedItemWithSublabel(
           base::IntToString(i),
           addresses[i]->DisplayName(),
           addresses[i]->DisplayNameDetail());
-
     }
 
     if (!IsSubmitPausedOn(wallet::VERIFY_CVV)) {
       const std::vector<wallet::WalletItems::MaskedInstrument*>& instruments =
           wallet_items_->instruments();
       for (size_t i = 0; i < instruments.size(); ++i) {
         // TODO(dbeam): respect the default address ID. http://crbug.com/232954
         suggested_cc_billing_.AddKeyedItemWithSublabelAndIcon(
             base::IntToString(i),
             instruments[i]->DisplayName(),
@@ skipping 529 matching lines @@
 void AutofillDialogControllerImpl::LogSuggestionItemSelectedMetric(
     const SuggestionsMenuModel& model) {
   DialogSection section = SectionForSuggestionsMenuModel(model);
 
   AutofillMetrics::DialogUiEvent dialog_ui_event;
   if (model.GetItemKeyForCheckedItem() == kAddNewItemKey) {
     // Selected to add a new item.
     dialog_ui_event = DialogSectionToUiItemAddedEvent(section);
   } else if (IsASuggestionItemKey(model.GetItemKeyForCheckedItem())) {
     // Selected an existing item.
-    DCHECK(!section_editing_state_[section]);
     dialog_ui_event = DialogSectionToUiSelectionChangedEvent(section);
   } else {
     // TODO(estade): add logging for "Manage items" or "Use billing for
     // shipping"?
     return;
   }
 
   GetMetricLogger().LogDialogUiEvent(dialog_type_, dialog_ui_event);
 }
 
@@ skipping 21 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill