Implementing VERIFY_CVV required action.

components/autofill/browser/wallet/wallet_items.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 "components/autofill/browser/wallet/wallet_items.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/autofill_type.h"
+#include "components/autofill/browser/credit_card.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace autofill {
 namespace wallet {
 
@@ skipping 199 matching lines @@
   return !(*this == other);
 }
 
 bool WalletItems::HasRequiredAction(RequiredAction action) const {
   DCHECK(ActionAppliesToWalletItems(action));
   return std::find(required_actions_.begin(),
                    required_actions_.end(),
                    action) != required_actions_.end();
 }
 
+const WalletItems::MaskedInstrument* WalletItems::GetInstrumentById(
+    const std::string& object_id) const {
+  if (object_id.empty())
+    return NULL;
+
+  for (size_t i = 0; i < instruments_.size(); ++i) {
+    if (instruments_[i]->object_id() == object_id)
+      return instruments_[i];
+  }
+
+  return NULL;
+}
+
 string16 WalletItems::MaskedInstrument::DisplayName() const {
 #if defined(OS_ANDROID)
   // TODO(aruslan): improve this stub implementation.
   return descriptive_name();
 #else
   return descriptive_name();
 #endif
 }
 
 string16 WalletItems::MaskedInstrument::DisplayNameDetail() const {
 #if defined(OS_ANDROID)
   // TODO(aruslan): improve this stub implementation.
   return address().DisplayName();
 #else
   return string16();
 #endif
 }
 
+string16 WalletItems::MaskedInstrument::TypeAndLastFourDigits() const {
+  string16 display_type = CreditCard::TypeForDisplay(kGenericCard);

[Ilya Sherman, 2013/03/27 23:59:23]

Optional nit: Consider initing to an empty string, and moving kGenericCard into
a catch-all else case.

[Dan Beam, 2013/03/28 03:38:12]

well, don't we disagree, lol. anyways, Done.

+
+  if (type_ == AMEX)
+    display_type = CreditCard::TypeForDisplay(kAmericanExpressCard);
+  else if (type_ == DISCOVER)
+    display_type = CreditCard::TypeForDisplay(kDiscoverCard);
+  else if (type_ == MASTER_CARD)
+    display_type = CreditCard::TypeForDisplay(kMasterCard);
+  else if (type_ == SOLO)
+    display_type = CreditCard::TypeForDisplay(kSoloCard);
+  else if (type_ == VISA)
+    display_type = CreditCard::TypeForDisplay(kVisaCard);
+
+  // TODO(dbeam): i18n.
+  return display_type + ASCIIToUTF16(" - ") + last_four_digits();
+}
+
 const gfx::Image& WalletItems::MaskedInstrument::CardIcon() const {
   int idr = 0;
   switch (type_) {
     case AMEX:
       idr = IDR_AUTOFILL_CC_AMEX;
       break;
 
     case DISCOVER:
       idr = IDR_AUTOFILL_CC_DISCOVER;
       break;
@@ skipping 227 matching lines @@
          VectorsAreEqual<LegalDocument>(legal_documents(),
                                         other.legal_documents());
 }
 
 bool WalletItems::operator!=(const WalletItems& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill