| 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
|
| index 89cea15dbc24ddb61f6ed1f417ee7945ebe1cc0e..e32cde142e75540fd85d623d24c67fc2fbb5bd0a 100644
|
| --- a/chrome/browser/autofill/wallet/wallet_items.cc
|
| +++ b/chrome/browser/autofill/wallet/wallet_items.cc
|
| @@ -53,6 +53,8 @@ wallet::WalletItems::MaskedInstrument::Status
|
|
|
| namespace wallet {
|
|
|
| +const char kPrivacyNoticeUrl[] = "https://wallet.google.com/files/privacy.html";
|
| +
|
| WalletItems::MaskedInstrument::MaskedInstrument(
|
| const std::string& descriptive_name,
|
| const WalletItems::MaskedInstrument::Type& type,
|
| @@ -203,7 +205,7 @@ bool WalletItems::MaskedInstrument::operator!=(
|
| }
|
|
|
| WalletItems::LegalDocument::LegalDocument(const std::string& document_id,
|
| - const std::string& display_name)
|
| + const string16& display_name)
|
| : document_id_(document_id),
|
| display_name_(display_name) {}
|
|
|
| @@ -218,7 +220,7 @@ scoped_ptr<WalletItems::LegalDocument>
|
| return scoped_ptr<LegalDocument>();
|
| }
|
|
|
| - std::string display_name;
|
| + string16 display_name;
|
| if (!dictionary.GetString("display_name", &display_name)) {
|
| DLOG(ERROR) << "Response from Google Wallet missing display name";
|
| return scoped_ptr<LegalDocument>();
|
|
|