Chromium Code Reviews| Index: chrome/browser/autofill/wallet/full_wallet.h |
| diff --git a/chrome/browser/autofill/wallet/full_wallet.h b/chrome/browser/autofill/wallet/full_wallet.h |
| index 848c2e162922b8aeba192b08dd157dc8e43dbb4e..a2b85a178af89bb2288fb2a791fc7b496b8bf8f8 100644 |
| --- a/chrome/browser/autofill/wallet/full_wallet.h |
| +++ b/chrome/browser/autofill/wallet/full_wallet.h |
| @@ -20,9 +20,13 @@ class DictionaryValue; |
| namespace wallet { |
| class FullWalletTest; |
| +class RequiredAction; |
|
Ilya Sherman
2013/01/05 03:15:06
Why do we need a full-out class for this, rather t
Dan Beam
2013/01/05 03:17:38
All the methods needed to live somewhere. What's
Ilya Sherman
2013/01/05 03:32:58
Free functions in a namespace are better, in this
Dan Beam
2013/01/05 03:50:16
Done.
|
| // FullWallet contains all the information a merchant requires from a user for |
| -// that user to make a purchase. |
| +// that user to make a purchase. This includes: |
| +// - billing information |
| +// - shipping information |
| +// - a proxy card for the "real" card selected from a user's wallet items |
| class FullWallet { |
| public: |
| ~FullWallet(); |
| @@ -50,7 +54,7 @@ class FullWallet { |
| // |shipping_address_| might contain NULL. |
| const Address* shipping_address() const { return shipping_address_.get(); } |
| - const std::vector<std::string>& required_actions() const { |
| + const std::vector<RequiredAction>& required_actions() const { |
| return required_actions_; |
| } |
| int expiration_month() const { return expiration_month_; } |
| @@ -66,7 +70,7 @@ class FullWallet { |
| const std::string& encrypted_rest, |
| scoped_ptr<Address> billing_address, |
| scoped_ptr<Address> shipping_address, |
| - const std::vector<std::string>& required_actions); |
| + const std::vector<RequiredAction>& required_actions); |
| void DecryptCardInfo(uint8* otp, size_t length); |
| int expiration_month_; |
| int expiration_year_; |
| @@ -82,9 +86,7 @@ class FullWallet { |
| scoped_ptr<Address> shipping_address_; |
| // Actions that must be completed by the user before a FullWallet can be |
| // issued to them by the Online Wallet service. |
| - // TODO(ahutter): |required_actions_| should be members of an enum not |
| - // strings. See http://crbug.com/165195. |
| - std::vector<std::string> required_actions_; |
| + std::vector<RequiredAction> required_actions_; |
| DISALLOW_COPY_AND_ASSIGN(FullWallet); |
| }; |