[Payments] Selecting incomplete items will open editors

chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc

 // Copyright 2017 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/payments/credit_card_editor_view_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 64 matching lines @@
     years.push_back(base::UTF8ToUTF16(std::to_string(now_exploded.year + i)));
   }
   return years;
 }
 
 }  // namespace
 
 CreditCardEditorViewController::CreditCardEditorViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
-    PaymentRequestDialogView* dialog)
-    : EditorViewController(spec, state, dialog) {}
+    PaymentRequestDialogView* dialog,
+    autofill::CreditCard* credit_card)
+    : EditorViewController(spec, state, dialog),
+      credit_card_to_edit_(credit_card) {}
 
 CreditCardEditorViewController::~CreditCardEditorViewController() {}
 
 // Creates the "Cards accepted" view with a row of icons at the top of the
 // credit card editor.
 // +----------------------------------------------+
 // | Cards Accepted                               |
 // |                                              |
 // | | VISA | | MC | | AMEX |                     |
 // +----------------------------------------------+
@@ skipping 56 matching lines @@
       {autofill::CREDIT_CARD_EXP_MONTH,
        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_MONTH),
        EditorField::LengthHint::HINT_SHORT, /* required= */ true,
        EditorField::ControlType::COMBOBOX},
       {autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR,
        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_YEAR),
        EditorField::LengthHint::HINT_SHORT, /* required= */ true,
        EditorField::ControlType::COMBOBOX}};
 }
 
+base::string16 CreditCardEditorViewController::GetInitialValueForType(
+    autofill::ServerFieldType type) {
+  if (!credit_card_to_edit_)
+    return base::string16();
+
+  return credit_card_to_edit_->GetInfo(autofill::AutofillType(type),
+                                       state()->GetApplicationLocale());
+}
+
 bool CreditCardEditorViewController::ValidateModelAndSave() {
+  const std::string& locale = state()->GetApplicationLocale();

[anthonyvd, 2017/04/10 15:59:55]

minor unrelated nit: why is GetApplicationLocale on state? It seems like it fits
more on spec, no (since it doesn't change)?

[Mathieu, 2017/04/10 16:05:17]

Yeah, there's no good place for this (and I don't want to create another class
alongside state and spec for helpers). Agreed it's probably better in spec. I'll
change it in a followup?

+  // Use a temporary object for validation.
   autofill::CreditCard credit_card;
   credit_card.set_origin(autofill::kSettingsOrigin);
+
   for (const auto& field : text_fields()) {
     // ValidatingTextfield* is the key, EditorField is the value.
     DCHECK_EQ(autofill::CREDIT_CARD,
               autofill::AutofillType(field.second.type).group());
     if (field.first->invalid())
       return false;
 
-    credit_card.SetRawInfo(field.second.type, field.first->text());
+    credit_card.SetInfo(autofill::AutofillType(field.second.type),
+                        field.first->text(), locale);
   }
   for (const auto& field : comboboxes()) {
     // ValidatingCombobox* is the key, EditorField is the value.
     DCHECK_EQ(autofill::CREDIT_CARD,
               autofill::AutofillType(field.second.type).group());
     ValidatingCombobox* combobox = field.first;
     if (combobox->invalid())
       return false;
 
-    credit_card.SetRawInfo(field.second.type,
-                           combobox->GetTextForRow(combobox->selected_index()));
+    credit_card.SetInfo(autofill::AutofillType(field.second.type),
+                        combobox->GetTextForRow(combobox->selected_index()),
+                        locale);
   }
 
   // TODO(mathp): Display global error message.
   if (!credit_card.IsValid())
     return false;
 
-  // Add the card (will not add a duplicate).
-  state()->GetPersonalDataManager()->AddCreditCard(credit_card);
+  if (!credit_card_to_edit_) {
+    // Add the card (will not add a duplicate).
+    state()->GetPersonalDataManager()->AddCreditCard(credit_card);
+  } else {
+    // We were in edit mode. Copy the data from the temporary object to retain
+    // the edited object's other properties (use count, use date, guid, etc.).
+    for (const auto& field : text_fields()) {
+      credit_card_to_edit_->SetInfo(
+          autofill::AutofillType(field.second.type),
+          credit_card.GetInfo(autofill::AutofillType(field.second.type),
+                              locale),
+          locale);
+    }
+    for (const auto& field : comboboxes()) {
+      credit_card_to_edit_->SetInfo(
+          autofill::AutofillType(field.second.type),
+          credit_card.GetInfo(autofill::AutofillType(field.second.type),
+                              locale),
+          locale);
+    }
+    state()->GetPersonalDataManager()->UpdateCreditCard(*credit_card_to_edit_);
+  }
 
   return true;
 }
 
 std::unique_ptr<ValidationDelegate>
 CreditCardEditorViewController::CreateValidationDelegate(
     const EditorField& field) {
   // The supported card networks for non-cc-number types are not passed to avoid
   // the data copy in the delegate.
   return base::MakeUnique<
@@ skipping 68 matching lines @@
   bool is_required_valid = !field_.required;
   const base::string16 displayed_message =
       is_required_valid ? base::ASCIIToUTF16("")
                         : l10n_util::GetStringUTF16(
                               IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   controller_->DisplayErrorMessageForField(field_, displayed_message);
   return is_required_valid;
 }
 
 }  // namespace payments