Add 2-lines summary to CC/Address for Wallet items.

components/autofill/browser/wallet/wallet_address.cc

 // 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 "components/autofill/browser/wallet/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/autofill_country.h"
@@ skipping 196 matching lines @@
   dict->SetString("recipient_name", recipient_name_);
   dict->SetString("locality_name", locality_name_);
   dict->SetString("administrative_area_name",
                   administrative_area_name_);
   dict->SetString("postal_code_number", postal_code_number_);
 
   return dict.Pass();
 }
 
 string16 Address::DisplayName() const {
+#if defined(OS_ANDROID)
+  // TODO(aruslan): improve this stub implementation.
+  return recipient_name();
+#else
   // TODO(estade): improve this stub implementation.
+  // TODO(estade): I18N.

[Evan Stade, 2013/03/14 01:00:39]

technically, l10n.

[aruslan, 2013/03/14 17:35:41]

Done.

   return recipient_name() + ASCIIToUTF16(", ") + address_line_1();
+#endif
+}
+
+string16 Address::DisplayNameLine2() const {
+#if defined(OS_ANDROID)
+  // TODO(aruslan): improve this stub implementation.
+  return address_line_1();
+#else
+  return string16();
+#endif
 }
 
 string16 Address::GetInfo(AutofillFieldType type) const {
   switch (type) {
     case NAME_FULL:
       return recipient_name();
 
     case ADDRESS_HOME_LINE1:
       return address_line_1();
 
@@ skipping 36 matching lines @@
          phone_number_ == other.phone_number_ &&
          object_id_ == other.object_id_;
 }
 
 bool Address::operator!=(const Address& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill