Index: chrome/browser/autofill/wallet/wallet_items.cc |
diff --git a/chrome/browser/autofill/wallet/wallet_items.cc b/chrome/browser/autofill/wallet/wallet_items.cc |
deleted file mode 100644 |
index 0687d4ed9c13e5e2ed71b8d0b501f3afe2314405..0000000000000000000000000000000000000000 |
--- a/chrome/browser/autofill/wallet/wallet_items.cc |
+++ /dev/null |
@@ -1,411 +0,0 @@ |
-// 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 "chrome/browser/autofill/wallet/wallet_items.h" |
- |
-#include "base/logging.h" |
-#include "base/values.h" |
-#include "googleurl/src/gurl.h" |
-#include "grit/webkit_resources.h" |
-#include "ui/base/resource/resource_bundle.h" |
-#include "ui/gfx/image/image.h" |
- |
-namespace autofill { |
-namespace wallet { |
- |
-namespace { |
- |
-const char kLegalDocumentUrl[] = |
- "https://wallet.google.com/customer/gadget/legaldocument.html?docId="; |
- |
-WalletItems::MaskedInstrument::Type |
- TypeFromString(const std::string& type_string) { |
- if (type_string == "VISA") |
- return WalletItems::MaskedInstrument::VISA; |
- if (type_string == "MASTER_CARD") |
- return WalletItems::MaskedInstrument::MASTER_CARD; |
- if (type_string == "AMEX") |
- return WalletItems::MaskedInstrument::AMEX; |
- if (type_string == "DISCOVER") |
- return WalletItems::MaskedInstrument::DISCOVER; |
- if (type_string == "SOLO") |
- return WalletItems::MaskedInstrument::SOLO; |
- if (type_string == "MAESTRO") |
- return WalletItems::MaskedInstrument::MAESTRO; |
- if (type_string == "SWITCH") |
- return WalletItems::MaskedInstrument::SWITCH; |
- return WalletItems::MaskedInstrument::UNKNOWN; |
-} |
- |
-WalletItems::MaskedInstrument::Status |
- StatusFromString(const std::string& status_string) { |
- if (status_string == "PENDING") |
- return WalletItems::MaskedInstrument::PENDING; |
- if (status_string == "VALID") |
- return WalletItems::MaskedInstrument::VALID; |
- if (status_string == "DECLINED") |
- return WalletItems::MaskedInstrument::DECLINED; |
- if (status_string == "DISABLED_FOR_THIS_MERCHANT") |
- return WalletItems::MaskedInstrument::DISABLED_FOR_THIS_MERCHANT; |
- if (status_string == "UNSUPPORTED_COUNTRY") |
- return WalletItems::MaskedInstrument::UNSUPPORTED_COUNTRY; |
- if (status_string == "EXPIRED") |
- return WalletItems::MaskedInstrument::EXPIRED; |
- if (status_string == "BILLING_INCOMPLETE") |
- return WalletItems::MaskedInstrument::BILLING_INCOMPLETE; |
- return WalletItems::MaskedInstrument::INAPPLICABLE; |
-} |
- |
-} // anonymous namespace |
- |
-WalletItems::MaskedInstrument::MaskedInstrument( |
- const string16& descriptive_name, |
- const WalletItems::MaskedInstrument::Type& type, |
- const std::vector<string16>& supported_currencies, |
- const string16& last_four_digits, |
- int expiration_month, |
- int expiration_year, |
- scoped_ptr<Address> address, |
- const WalletItems::MaskedInstrument::Status& status, |
- const std::string& object_id) |
- : descriptive_name_(descriptive_name), |
- type_(type), |
- supported_currencies_(supported_currencies), |
- last_four_digits_(last_four_digits), |
- expiration_month_(expiration_month), |
- expiration_year_(expiration_year), |
- address_(address.Pass()), |
- status_(status), |
- object_id_(object_id) { |
- DCHECK(address_.get()); |
-} |
- |
-WalletItems::MaskedInstrument::~MaskedInstrument() {} |
- |
-scoped_ptr<WalletItems::MaskedInstrument> |
- WalletItems::MaskedInstrument::CreateMaskedInstrument( |
- const base::DictionaryValue& dictionary) { |
- std::string type_string; |
- Type type; |
- if (dictionary.GetString("type", &type_string)) { |
- type = TypeFromString(type_string); |
- } else { |
- DLOG(ERROR) << "Response from Google Wallet missing card type"; |
- return scoped_ptr<MaskedInstrument>(); |
- } |
- |
- string16 last_four_digits; |
- if (!dictionary.GetString("last_four_digits", &last_four_digits)) { |
- DLOG(ERROR) << "Response from Google Wallet missing last four digits"; |
- return scoped_ptr<MaskedInstrument>(); |
- } |
- |
- std::string status_string; |
- Status status; |
- if (dictionary.GetString("status", &status_string)) { |
- status = StatusFromString(status_string); |
- } else { |
- DLOG(ERROR) << "Response from Google Wallet missing status"; |
- return scoped_ptr<MaskedInstrument>(); |
- } |
- |
- std::string object_id; |
- if (!dictionary.GetString("object_id", &object_id)) { |
- DLOG(ERROR) << "Response from Google Wallet missing object id"; |
- return scoped_ptr<MaskedInstrument>(); |
- } |
- |
- const DictionaryValue* address_dict; |
- if (!dictionary.GetDictionary("billing_address", &address_dict)) { |
- DLOG(ERROR) << "Response from Google wallet missing address"; |
- return scoped_ptr<MaskedInstrument>(); |
- } |
- scoped_ptr<Address> address = Address::CreateDisplayAddress(*address_dict); |
- |
- if (!address.get()) { |
- DLOG(ERROR) << "Response from Google wallet contained malformed address"; |
- return scoped_ptr<MaskedInstrument>(); |
- } |
- |
- std::vector<string16> supported_currencies; |
- const ListValue* supported_currency_list; |
- if (dictionary.GetList("supported_currency", &supported_currency_list)) { |
- for (size_t i = 0; i < supported_currency_list->GetSize(); ++i) { |
- string16 currency; |
- if (supported_currency_list->GetString(i, ¤cy)) |
- supported_currencies.push_back(currency); |
- } |
- } else { |
- DVLOG(1) << "Response from Google Wallet missing supported currency"; |
- } |
- |
- int expiration_month; |
- if (!dictionary.GetInteger("expiration_month", &expiration_month)) |
- DVLOG(1) << "Response from Google Wallet missing expiration month"; |
- |
- int expiration_year; |
- if (!dictionary.GetInteger("expiration_year", &expiration_year)) |
- DVLOG(1) << "Response from Google Wallet missing expiration year"; |
- |
- string16 descriptive_name; |
- if (!dictionary.GetString("descriptive_name", &descriptive_name)) |
- DVLOG(1) << "Response from Google Wallet missing descriptive name"; |
- |
- return scoped_ptr<MaskedInstrument>(new MaskedInstrument(descriptive_name, |
- type, |
- supported_currencies, |
- last_four_digits, |
- expiration_month, |
- expiration_year, |
- address.Pass(), |
- status, |
- object_id)); |
-} |
- |
-bool WalletItems::MaskedInstrument::operator==( |
- const WalletItems::MaskedInstrument& other) const { |
- if (descriptive_name_ != other.descriptive_name_) |
- return false; |
- if (type_ != other.type_) |
- return false; |
- if (supported_currencies_ != other.supported_currencies_) |
- return false; |
- if (last_four_digits_ != other.last_four_digits_) |
- return false; |
- if (expiration_month_ != other.expiration_month_) |
- return false; |
- if (expiration_year_ != other.expiration_year_) |
- return false; |
- if (address_.get()) { |
- if (other.address_.get()) { |
- if (*address_.get() != *other.address_.get()) |
- return false; |
- } else { |
- return false; |
- } |
- } else if (other.address_.get()) { |
- return false; |
- } |
- if (status_ != other.status_) |
- return false; |
- if (object_id_ != other.object_id_) |
- return false; |
- return true; |
-} |
- |
-bool WalletItems::MaskedInstrument::operator!=( |
- const WalletItems::MaskedInstrument& other) const { |
- 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 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; |
- |
- case MASTER_CARD: |
- idr = IDR_AUTOFILL_CC_MASTERCARD; |
- break; |
- |
- case SOLO: |
- idr = IDR_AUTOFILL_CC_SOLO; |
- break; |
- |
- case VISA: |
- idr = IDR_AUTOFILL_CC_VISA; |
- break; |
- |
- case MAESTRO: |
- case SWITCH: |
- case UNKNOWN: |
- idr = IDR_AUTOFILL_CC_GENERIC; |
- break; |
- } |
- |
- return ResourceBundle::GetSharedInstance().GetImageNamed(idr); |
-} |
- |
-WalletItems::LegalDocument::LegalDocument(const std::string& document_id, |
- const std::string& display_name) |
- : document_id_(document_id), |
- display_name_(display_name) {} |
- |
-WalletItems::LegalDocument::~LegalDocument() {} |
- |
-scoped_ptr<WalletItems::LegalDocument> |
- WalletItems::LegalDocument::CreateLegalDocument( |
- const base::DictionaryValue& dictionary) { |
- std::string document_id; |
- if (!dictionary.GetString("legal_document_id", &document_id)) { |
- DLOG(ERROR) << "Response from Google Wallet missing legal document id"; |
- return scoped_ptr<LegalDocument>(); |
- } |
- |
- std::string display_name; |
- if (!dictionary.GetString("display_name", &display_name)) { |
- DLOG(ERROR) << "Response from Google Wallet missing display name"; |
- return scoped_ptr<LegalDocument>(); |
- } |
- |
- return scoped_ptr<LegalDocument>(new LegalDocument(document_id, |
- display_name)); |
-} |
- |
-GURL WalletItems::LegalDocument::GetUrl() { |
- return GURL(kLegalDocumentUrl + document_id_); |
-} |
- |
-bool WalletItems::LegalDocument::operator==(const LegalDocument& other) const { |
- return document_id_ == other.document_id_ && |
- display_name_ == other.display_name_; |
-} |
- |
-bool WalletItems::LegalDocument::operator!=(const LegalDocument& other) const { |
- return !(*this == other); |
-} |
- |
-WalletItems::WalletItems(const std::vector<RequiredAction>& required_actions, |
- const std::string& google_transaction_id, |
- const std::string& default_instrument_id, |
- const std::string& default_address_id, |
- const std::string& obfuscated_gaia_id) |
- : required_actions_(required_actions), |
- google_transaction_id_(google_transaction_id), |
- default_instrument_id_(default_instrument_id), |
- default_address_id_(default_address_id), |
- obfuscated_gaia_id_(obfuscated_gaia_id) {} |
- |
-WalletItems::~WalletItems() {} |
- |
-scoped_ptr<WalletItems> |
- WalletItems::CreateWalletItems(const base::DictionaryValue& dictionary) { |
- std::vector<RequiredAction> required_action; |
- const ListValue* required_action_list; |
- if (dictionary.GetList("required_action", &required_action_list)) { |
- for (size_t i = 0; i < required_action_list->GetSize(); ++i) { |
- std::string action_string; |
- if (required_action_list->GetString(i, &action_string)) { |
- RequiredAction action = ParseRequiredActionFromString(action_string); |
- if (!ActionAppliesToWalletItems(action)) { |
- DLOG(ERROR) << "Response from Google wallet with bad required action:" |
- " \"" << action_string << "\""; |
- return scoped_ptr<WalletItems>(); |
- } |
- required_action.push_back(action); |
- } |
- } |
- } else { |
- DVLOG(1) << "Response from Google wallet missing required actions"; |
- } |
- |
- std::string google_transaction_id; |
- if (!dictionary.GetString("google_transaction_id", &google_transaction_id) && |
- required_action.empty()) { |
- DLOG(ERROR) << "Response from Google wallet missing google transaction id"; |
- return scoped_ptr<WalletItems>(); |
- } |
- |
- std::string default_instrument_id; |
- if (!dictionary.GetString("default_instrument_id", &default_instrument_id)) |
- DVLOG(1) << "Response from Google wallet missing default instrument id"; |
- |
- std::string default_address_id; |
- if (!dictionary.GetString("default_address_id", &default_address_id)) |
- DVLOG(1) << "Response from Google wallet missing default_address_id"; |
- |
- std::string obfuscated_gaia_id; |
- if (!dictionary.GetString("obfuscated_gaia_id", &obfuscated_gaia_id)) |
- DVLOG(1) << "Response from Google wallet missing obfuscated gaia id"; |
- |
- scoped_ptr<WalletItems> wallet_items(new WalletItems(required_action, |
- google_transaction_id, |
- default_instrument_id, |
- default_address_id, |
- obfuscated_gaia_id)); |
- |
- const ListValue* legal_docs; |
- if (dictionary.GetList("required_legal_document", &legal_docs)) { |
- for (size_t i = 0; i < legal_docs->GetSize(); ++i) { |
- const DictionaryValue* legal_doc_dict; |
- if (legal_docs->GetDictionary(i, &legal_doc_dict)) { |
- scoped_ptr<LegalDocument> legal_doc( |
- LegalDocument::CreateLegalDocument(*legal_doc_dict)); |
- if (legal_doc.get()) { |
- wallet_items->AddLegalDocument(legal_doc.Pass()); |
- } else { |
- DLOG(ERROR) << "Malformed legal document in response from " |
- "Google wallet"; |
- return scoped_ptr<WalletItems>(); |
- } |
- } |
- } |
- } else { |
- DVLOG(1) << "Response from Google wallet missing legal docs"; |
- } |
- |
- const ListValue* instruments; |
- if (dictionary.GetList("instrument", &instruments)) { |
- for (size_t i = 0; i < instruments->GetSize(); ++i) { |
- const DictionaryValue* instrument_dict; |
- if (instruments->GetDictionary(i, &instrument_dict)) { |
- scoped_ptr<MaskedInstrument> instrument( |
- MaskedInstrument::CreateMaskedInstrument(*instrument_dict)); |
- if (instrument.get()) |
- wallet_items->AddInstrument(instrument.Pass()); |
- else |
- DLOG(ERROR) << "Malformed instrument in response from Google Wallet"; |
- } |
- } |
- } else { |
- DVLOG(1) << "Response from Google wallet missing instruments"; |
- } |
- |
- const ListValue* addresses; |
- if (dictionary.GetList("address", &addresses)) { |
- for (size_t i = 0; i < addresses->GetSize(); ++i) { |
- const DictionaryValue* address_dict; |
- if (addresses->GetDictionary(i, &address_dict)) { |
- scoped_ptr<Address> address( |
- Address::CreateAddressWithID(*address_dict)); |
- if (address.get()) |
- wallet_items->AddAddress(address.Pass()); |
- else |
- DLOG(ERROR) << "Malformed address in response from Google Wallet"; |
- } |
- } |
- } else { |
- DVLOG(1) << "Response from Google wallet missing addresses"; |
- } |
- |
- return wallet_items.Pass(); |
-} |
- |
-bool WalletItems::operator==(const WalletItems& other) const { |
- // TODO(ahutter): Check scoped vector equality. |
- return google_transaction_id_ == other.google_transaction_id_ && |
- default_instrument_id_ == other.default_instrument_id_ && |
- default_address_id_ == other.default_address_id_ && |
- required_actions_ == other.required_actions_ && |
- obfuscated_gaia_id_ == other.obfuscated_gaia_id_; |
-} |
- |
-bool WalletItems::operator!=(const WalletItems& other) const { |
- return !(*this == other); |
-} |
- |
-} // namespace wallet |
-} // namespace autofill |