Add checkbox to card unmasking prompt

components/autofill/core/browser/autofill_manager.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 "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 169 matching lines @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kAutofillWalletSyncExperimentEnabled,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   // TODO(estade): Should this be syncable?
   registry->RegisterBooleanPref(
       prefs::kAutofillWalletImportEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  // This choice is made on a per-device basis, so it's not syncable.
+  registry->RegisterBooleanPref(
+      prefs::kAutofillWalletImportStorageCheckboxState,
+      true,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #if defined(OS_MACOSX)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #else  // defined(OS_MACOSX)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesEnabled,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ skipping 509 matching lines @@
 
   // Forward form structures to the password generation manager to detect
   // account creation forms.
   driver_->DetectAccountCreationForms(form_structures_.get());
 
   // If the corresponding flag is set, annotate forms with the predicted types.
   driver_->SendAutofillTypePredictionsToRenderer(form_structures_.get());
 }
 
 void AutofillManager::OnUnmaskResponse(const UnmaskResponse& response) {
-  unmasking_cvc_ = response.cvc;
+  unmask_response_ = response;
   // TODO(estade): use month/year.
   real_pan_client_.UnmaskCard(unmasking_card_, base::UTF16ToASCII(response.cvc),
                               response.risk_data);
 }
 
 void AutofillManager::OnUnmaskPromptClosed() {
   real_pan_client_.CancelRequest();
   driver_->RendererShouldClearPreviewedForm();
   unmasking_card_ = CreditCard();
-  unmasking_cvc_.clear();
+  unmask_response_ = UnmaskResponse();
 }
 
 IdentityProvider* AutofillManager::GetIdentityProvider() {
   return client()->GetIdentityProvider();
 }
 
 void AutofillManager::OnDidGetRealPan(const std::string& real_pan) {
   if (!real_pan.empty()) {
     unmasking_card_.set_record_type(CreditCard::FULL_SERVER_CARD);
     unmasking_card_.SetNumber(base::UTF8ToUTF16(real_pan));
-    personal_data_->UpdateServerCreditCard(unmasking_card_);
+    if (unmask_response_.should_store_pan)
+      personal_data_->UpdateServerCreditCard(unmasking_card_);
+
     FillCreditCardForm(unmasking_query_id_, unmasking_form_, unmasking_field_,
                        unmasking_card_);
   }
 
   client()->OnUnmaskVerificationResult(!real_pan.empty());
 }
 
 void AutofillManager::OnDidEndTextFieldEditing() {
   external_delegate_->DidEndTextFieldEditing();
 }
@@ skipping 307 matching lines @@
     size_t use_variant = 0;
     if (result.fields[i].SameFieldAs(field) ||
         field_group_type == initiating_group_type) {
       use_variant = variant;
     }
     base::string16 value = data_model->GetInfoForVariant(
         cached_field->Type(), use_variant, app_locale_);
     if (is_credit_card &&
         cached_field->Type().GetStorableType() ==
             CREDIT_CARD_VERIFICATION_CODE) {
-      // If this is |unmasking_card_|, |unmasking_cvc_| should be non-empty
-      // and vice versa.
-      DCHECK_EQ(&unmasking_card_ == data_model, !unmasking_cvc_.empty());
-      value = unmasking_cvc_;
+      // If this is |unmasking_card_|, |unmask_response_,cvc| should be
+      // non-empty and vice versa.
+      value = unmask_response_.cvc;
+      DCHECK_EQ(&unmasking_card_ == data_model, value.empty());
     }
 
     // Must match ForEachMatchingFormField() in form_autofill_util.cc.
     // Only notify autofilling of empty fields and the field that initiated
     // the filling (note that "select-one" controls may not be empty but will
     // still be autofilled).
     bool should_notify =
         !is_credit_card &&
         !value.empty() &&
         (result.fields[i].SameFieldAs(field) ||
@@ skipping 312 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed())
     return false;
 
   return true;
 }
 
 }  // namespace autofill