| Index: chrome/browser/autofill/wallet/wallet_items.h
|
| diff --git a/chrome/browser/autofill/wallet/wallet_items.h b/chrome/browser/autofill/wallet/wallet_items.h
|
| index eb33784789d304478ca462501a77c2b72ae6d79d..92a90c9152df5555aa121e0eb21e08d9aae5af0f 100644
|
| --- a/chrome/browser/autofill/wallet/wallet_items.h
|
| +++ b/chrome/browser/autofill/wallet/wallet_items.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| +#include "base/string16.h"
|
| #include "chrome/browser/autofill/wallet/required_action.h"
|
| #include "chrome/browser/autofill/wallet/wallet_address.h"
|
|
|
| @@ -26,6 +27,8 @@ namespace wallet {
|
|
|
| class WalletItemsTest;
|
|
|
| +extern const char kPrivacyNoticeUrl[];
|
| +
|
| // WalletItems is a collection of cards and addresses that a user picks from to
|
| // construct a full wallet. However, it also provides a transaction ID which
|
| // must be used throughout all API calls being made using this data.
|
| @@ -125,7 +128,7 @@ class WalletItems {
|
| bool operator!=(const LegalDocument& other) const;
|
|
|
| const std::string& document_id() const { return document_id_; }
|
| - const std::string& display_name() const { return display_name_; }
|
| + const string16& display_name() const { return display_name_; }
|
|
|
| private:
|
| friend class WalletItemsTest;
|
| @@ -133,9 +136,9 @@ class WalletItems {
|
| FRIEND_TEST_ALL_PREFIXES(WalletItemsTest, CreateWalletItems);
|
| FRIEND_TEST_ALL_PREFIXES(WalletItemsTest, LegalDocumentGetUrl);
|
| LegalDocument(const std::string& document_id,
|
| - const std::string& display_name);
|
| + const string16& display_name);
|
| std::string document_id_;
|
| - std::string display_name_;
|
| + string16 display_name_;
|
| DISALLOW_COPY_AND_ASSIGN(LegalDocument);
|
| };
|
|
|
|
|