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 356 matching lines @@
               arraysize(kCCInputs),
               &requested_cc_billing_fields_);
   BuildInputs(kBillingInputs,
               arraysize(kBillingInputs),
               &requested_cc_billing_fields_);
 
   BuildInputs(kShippingInputs,
               arraysize(kShippingInputs),
               &requested_shipping_fields_);
 
-  SuggestionsUpdated();
-
   // TODO(estade): don't show the dialog if the site didn't specify the right
   // fields. First we must figure out what the "right" fields are.
   view_.reset(CreateView());
   view_->Show();
   GetManager()->AddObserver(this);
 
+  // This should be done while |view_| is non-NULL.

[Evan Stade, 2013/04/30 19:03:10]

dislike. The controller should not need to update the view as soon as it's
created. The view should always be able to poll the controller to get all the
current state that's necessary for displaying the UI.

[Dan Beam, 2013/05/01 00:43:09]

Reverted.

+  SuggestionsUpdated();
+
   // 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();
   else
     LogDialogLatencyToShow();
 }
 
@@ skipping 239 matching lines @@
 
   legal_document_link_ranges_.clear();
   for (size_t i = 0; i < documents.size(); ++i) {
     size_t link_start = text.find(documents[i]->display_name());
     legal_document_link_ranges_.push_back(ui::Range(
         link_start, link_start + documents[i]->display_name().size()));
   }
   legal_documents_text_ = text;
 }
 
+void AutofillDialogControllerImpl::ShowEditingMode(DialogSection section) {
+  scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
+  wrapper->FillInputs(MutableRequestedFieldsForSection(section));
+  section_editing_state_[section] = true;
+  view_->UpdateSection(section);
+}
+
 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);
   }
 
@@ skipping 129 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);
-  section_editing_state_[section] = true;
-  view_->UpdateSection(section);
-
+  ShowEditingMode(section);
   GetMetricLogger().LogDialogUiEvent(
       dialog_type_, DialogSectionToUiEditEvent(section));
 }
 
 void AutofillDialogControllerImpl::EditCancelledForSection(
     DialogSection section) {
   ResetManualInputForSection(section);
   view_->UpdateSection(section);
 }
 
@@ skipping 467 matching lines @@
           chrome::kAutofillSubPage));
     } else {
       // TODO(estade): show a wallet URL.
       NOTIMPLEMENTED();
     }
 
     return;
   }
 
   model->SetCheckedIndex(index);
-  EditCancelledForSection(SectionForSuggestionsMenuModel(*model));
+  const DialogSection section = SectionForSuggestionsMenuModel(*model);
+  EditCancelledForSection(section);
+
+  // If a user chooses a real suggestion (not Add/Edit) and the suggestion text
+  // is empty, it's invalid. Show the editing UI and highlight invalid fields.
+  if (IsASuggestionItemKey(model->GetItemKeyForCheckedItem()) &&
+      SuggestionTextForSection(section).empty()) {
+    ShowEditingMode(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 136 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 67 matching lines @@
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_MANAGE_EMAIL_ADDRESS));
   }
 
   suggested_shipping_.AddKeyedItem(
       kAddNewItemKey,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_SHIPPING_ADDRESS));
   suggested_shipping_.AddKeyedItem(
       kManageItemsKey,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_MANAGE_SHIPPING_ADDRESS));
 
-  // Default shipping address is the first suggestion, if one exists. Otherwise
-  // it's the "Use shipping for billing" item.
-  const std::string& first_real_suggestion_item_key =
-      suggested_shipping_.GetItemKeyAt(1);
-  if (IsASuggestionItemKey(first_real_suggestion_item_key))
-      suggested_shipping_.SetCheckedItem(first_real_suggestion_item_key);
+  for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
+    DialogSection section = static_cast<DialogSection>(i);
+    SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
+
+    if (model->GetItemCount() == 0)
+      continue;
+
+    size_t default_suggestion_index = 0;
+
+    if (section == SECTION_SHIPPING) {
+      // Default shipping address is the first suggestion, if one exists.
+      // Otherwise it's the "Use shipping for billing" item.
+      const size_t kFirstRealSuggestionIndex = 1;

[Evan Stade, 2013/04/30 19:03:10]

I don't see the benefit to the way you rewrote this. It actually detracts,
because 

IsASuggestionItemKey(model->GetItemKeyAt(kFirstRealSuggestionIndex))

doesn't make much sense --- on the surface, it should always return true

[Dan Beam, 2013/05/01 00:43:09]

Reverted.

+      if (IsASuggestionItemKey(model->GetItemKeyAt(kFirstRealSuggestionIndex)))
+        default_suggestion_index = kFirstRealSuggestionIndex;
+    }
+
+    SuggestionItemSelected(model, default_suggestion_index);

[Evan Stade, 2013/04/30 19:03:10]

this feels wrong to me. For one thing, it screws with the metrics. You should
just fill the inputs and set the editing state for invalid suggestions.

[Dan Beam, 2013/05/01 00:43:09]

Done.

+  }
 
   if (view_)
     view_->ModelChanged();
 }
 
 bool AutofillDialogControllerImpl::IsCompleteProfile(
     const AutofillProfile& profile) {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t i = 0; i < requested_shipping_fields_.size(); ++i) {
     AutofillFieldType type = requested_shipping_fields_[i].type;
@@ skipping 467 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 44 matching lines @@
       url,
       content::PAGE_TRANSITION_AUTO_BOOKMARK);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 #else
   // TODO(estade): use TabModelList?
 #endif
 }
 
 }  // namespace autofill