Handle expired Autofill credit cards in autofill dialog

chrome/browser/ui/autofill/data_model_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
@@ skipping 38 matching lines @@
   virtual string16 GetDisplayText();
 
   // Fills in |form_structure| with the data that this model contains. |inputs|
   // and |comparator| are used to determine whether each field in the
   // FormStructure should be filled in or left alone.
   void FillFormStructure(
       const DetailInputs& inputs,
       const InputFieldComparator& compare,
       FormStructure* form_structure);
 
+  // Whether the wrapper has valid data (e.g. whether a credit card is expired).
+  virtual bool IsValid() const = 0;

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

no need to make this pure virtual

why add this instead of just changing the implementation of GetDisplayText()?

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

Done.

+
  protected:
   DataModelWrapper();
 
   // Fills in |field| with data from the model.
   virtual void FillFormField(AutofillField* field);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DataModelWrapper);
 };
 
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AutofillDataModelWrapper);
 };
 
 // A DataModelWrapper for Autofill profiles.
 class AutofillProfileWrapper : public AutofillDataModelWrapper {
  public:
   AutofillProfileWrapper(const AutofillProfile* profile, size_t variant);
   virtual ~AutofillProfileWrapper();
 
   virtual void FillInputs(DetailInputs* inputs) OVERRIDE;
+  virtual bool IsValid() const OVERRIDE;
 
  private:
   const AutofillProfile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillProfileWrapper);
 };
 
 // A DataModelWrapper specifically for Autofill CreditCard data.
 class AutofillCreditCardWrapper : public AutofillDataModelWrapper {
  public:
   explicit AutofillCreditCardWrapper(const CreditCard* card);
   virtual ~AutofillCreditCardWrapper();
 
   virtual string16 GetInfo(AutofillFieldType type) OVERRIDE;
   virtual gfx::Image GetIcon() OVERRIDE;
   virtual string16 GetDisplayText() OVERRIDE;
+  virtual bool IsValid() const OVERRIDE;
 
  protected:
   virtual void FillFormField(AutofillField* field) OVERRIDE;
 
  private:
   const CreditCard* card_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillCreditCardWrapper);
 };
 
 // A DataModelWrapper for Wallet addresses.
 class WalletAddressWrapper : public DataModelWrapper {
  public:
   explicit WalletAddressWrapper(const wallet::Address* address);
   virtual ~WalletAddressWrapper();
 
   virtual string16 GetInfo(AutofillFieldType type) OVERRIDE;
+  virtual bool IsValid() const OVERRIDE;
 
  private:
   const wallet::Address* address_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletAddressWrapper);
 };
 
 // A DataModelWrapper for Wallet instruments.
 class WalletInstrumentWrapper : public DataModelWrapper {
  public:
   explicit WalletInstrumentWrapper(
       const wallet::WalletItems::MaskedInstrument* instrument);
   virtual ~WalletInstrumentWrapper();
 
   virtual string16 GetInfo(AutofillFieldType type) OVERRIDE;
   virtual gfx::Image GetIcon() OVERRIDE;
   virtual string16 GetDisplayText() OVERRIDE;
+  virtual bool IsValid() const OVERRIDE;
 
  private:
   const wallet::WalletItems::MaskedInstrument* instrument_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletInstrumentWrapper);
 };
 
 // A DataModelWrapper for FullWallets billing data.
 class FullWalletBillingWrapper : public DataModelWrapper {
  public:
   explicit FullWalletBillingWrapper(wallet::FullWallet* full_wallet);
   virtual ~FullWalletBillingWrapper();
 
   virtual string16 GetInfo(AutofillFieldType type) OVERRIDE;
+  virtual bool IsValid() const OVERRIDE;
 
  private:
   wallet::FullWallet* full_wallet_;
 
   DISALLOW_COPY_AND_ASSIGN(FullWalletBillingWrapper);
 };
 
 // A DataModelWrapper for FullWallets shipping data.
 class FullWalletShippingWrapper : public DataModelWrapper {
  public:
   explicit FullWalletShippingWrapper(wallet::FullWallet* full_wallet);
   virtual ~FullWalletShippingWrapper();
 
   virtual string16 GetInfo(AutofillFieldType type) OVERRIDE;
+  virtual bool IsValid() const OVERRIDE;
 
  private:
   wallet::FullWallet* full_wallet_;
 
   DISALLOW_COPY_AND_ASSIGN(FullWalletShippingWrapper);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_