rAc: try really hard not to ellipsize addresses

chrome/browser/ui/autofill/data_model_wrapper.cc

Index: chrome/browser/ui/autofill/data_model_wrapper.cc
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.cc b/chrome/browser/ui/autofill/data_model_wrapper.cc
index b1a1f766b2f7bda8568795490fac6ed14a19bc39..d921b4aed204b27945ab4c70d6ab0dae577c2751 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper.cc
@@ -24,17 +24,25 @@ namespace autofill {
 
 DataModelWrapper::~DataModelWrapper() {}
 
-string16 DataModelWrapper::GetDisplayText() {
-  string16 comma = ASCIIToUTF16(", ");
-  string16 label = GetInfo(NAME_FULL) + comma + GetInfo(ADDRESS_HOME_LINE1);
-  string16 address2 = GetInfo(ADDRESS_HOME_LINE2);
-  if (!address2.empty())
-    label += comma + address2;
-  label += ASCIIToUTF16("\n") +
-      GetInfo(ADDRESS_HOME_CITY) + comma +
-      GetInfo(ADDRESS_HOME_STATE) + ASCIIToUTF16(" ") +
-      GetInfo(ADDRESS_HOME_ZIP);
-  return label;
+gfx::Image DataModelWrapper::GetIcon() {
+  return gfx::Image();
+}
+
+void DataModelWrapper::FillInputs(DetailInputs* inputs) {
+  for (size_t i = 0; i < inputs->size(); ++i) {
+    (*inputs)[i].initial_value = GetInfo((*inputs)[i].type);
+  }
+}
+
+bool DataModelWrapper::GetDisplayText(
+    base::string16* vertically_compact,
+    base::string16* horizontally_compact) {
+  base::string16 comma = ASCIIToUTF16(", ");
+  base::string16 newline = ASCIIToUTF16("\n");
+
+  *vertically_compact = GetAddressDisplayText(comma);
+  *horizontally_compact = GetAddressDisplayText(newline);
+  return true;
 }
 
 bool DataModelWrapper::FillFormStructure(
@@ -55,20 +63,31 @@ bool DataModelWrapper::FillFormStructure(
   return filled_something;
 }
 
-void DataModelWrapper::FillInputs(DetailInputs* inputs) {
-  for (size_t i = 0; i < inputs->size(); ++i) {
-    (*inputs)[i].initial_value = GetInfo((*inputs)[i].type);
-  }
-}
+DataModelWrapper::DataModelWrapper() {}
 
 void DataModelWrapper::FillFormField(AutofillField* field) const {
   field->value = GetInfo(field->type());
 }
 
-DataModelWrapper::DataModelWrapper() {}
+base::string16 DataModelWrapper::GetAddressDisplayText(
+    const base::string16& separator) {
+  base::string16 address = GetInfo(NAME_FULL) + separator +
+      GetInfo(ADDRESS_HOME_LINE1);
+  base::string16 address2 = GetInfo(ADDRESS_HOME_LINE2);
+  if (!address2.empty())
+    address += separator + address2;
 
-gfx::Image DataModelWrapper::GetIcon() {
-  return gfx::Image();
+  base::string16 comma = ASCIIToUTF16(", ");
+  base::string16 newline = ASCIIToUTF16("\n");
+  address += separator +
+      GetInfo(ADDRESS_HOME_CITY) + comma +
+      GetInfo(ADDRESS_HOME_STATE) + ASCIIToUTF16(" ") +
+      GetInfo(ADDRESS_HOME_ZIP);
+
+  // TODO(estade): email?
+  address += newline + GetInfo(PHONE_HOME_WHOLE_NUMBER);
+
+  return address;
 }
 
 // EmptyDataModelWrapper
@@ -76,8 +95,8 @@ gfx::Image DataModelWrapper::GetIcon() {
 EmptyDataModelWrapper::EmptyDataModelWrapper() {}
 EmptyDataModelWrapper::~EmptyDataModelWrapper() {}
 
-string16 EmptyDataModelWrapper::GetInfo(AutofillFieldType type) const {
-  return string16();
+base::string16 EmptyDataModelWrapper::GetInfo(AutofillFieldType type) const {
+  return base::string16();
 }
 
 void EmptyDataModelWrapper::FillFormField(AutofillField* field) const {}
@@ -92,7 +111,7 @@ AutofillDataModelWrapper::AutofillDataModelWrapper(
 
 AutofillDataModelWrapper::~AutofillDataModelWrapper() {}
 
-string16 AutofillDataModelWrapper::GetInfo(AutofillFieldType type) const {
+base::string16 AutofillDataModelWrapper::GetInfo(AutofillFieldType type) const {
   return data_model_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
@@ -113,7 +132,7 @@ AutofillProfileWrapper::~AutofillProfileWrapper() {}
 void AutofillProfileWrapper::FillInputs(DetailInputs* inputs) {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t j = 0; j < inputs->size(); ++j) {
-    std::vector<string16> values;
+    std::vector<base::string16> values;
     profile_->GetMultiInfo((*inputs)[j].type, app_locale, &values);
     (*inputs)[j].initial_value = values[variant()];
   }
@@ -142,7 +161,8 @@ AutofillCreditCardWrapper::AutofillCreditCardWrapper(const CreditCard* card)
 
 AutofillCreditCardWrapper::~AutofillCreditCardWrapper() {}
 
-string16 AutofillCreditCardWrapper::GetInfo(AutofillFieldType type) const {
+base::string16 AutofillCreditCardWrapper::GetInfo(
+    AutofillFieldType type) const {
   if (type == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(card_->expiration_month());
 
@@ -154,11 +174,14 @@ gfx::Image AutofillCreditCardWrapper::GetIcon() {
   return rb.GetImageNamed(CreditCard::IconResourceId(card_->type()));
 }
 
-string16 AutofillCreditCardWrapper::GetDisplayText() {
+bool AutofillCreditCardWrapper::GetDisplayText(
+    base::string16* vertically_compact,
+    base::string16* horizontally_compact) {
   if (!card_->IsValid())
-    return string16();
+    return false;
 
-  return card_->TypeAndLastFourDigits();
+  *vertically_compact = *horizontally_compact = card_->TypeAndLastFourDigits();
+  return true;
 }
 
 // WalletAddressWrapper
@@ -168,17 +191,20 @@ WalletAddressWrapper::WalletAddressWrapper(
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
-string16 WalletAddressWrapper::GetInfo(AutofillFieldType type) const {
+base::string16 WalletAddressWrapper::GetInfo(AutofillFieldType type) const {
   return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
-string16 WalletAddressWrapper::GetDisplayText() {
+bool WalletAddressWrapper::GetDisplayText(
+    base::string16* vertically_compact,
+    base::string16* horizontally_compact) {
   if (!address_->is_complete_address() ||
       GetInfo(PHONE_HOME_WHOLE_NUMBER).empty()) {
-    return string16();
+    return false;
   }
 
-  return DataModelWrapper::GetDisplayText();
+  return DataModelWrapper::GetDisplayText(vertically_compact,
+                                          horizontally_compact);
 }
 
 // WalletInstrumentWrapper
@@ -189,7 +215,7 @@ WalletInstrumentWrapper::WalletInstrumentWrapper(
 
 WalletInstrumentWrapper::~WalletInstrumentWrapper() {}
 
-string16 WalletInstrumentWrapper::GetInfo(AutofillFieldType type) const {
+base::string16 WalletInstrumentWrapper::GetInfo(AutofillFieldType type) const {
   if (type == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(instrument_->expiration_month());
 
@@ -200,18 +226,23 @@ gfx::Image WalletInstrumentWrapper::GetIcon() {
   return instrument_->CardIcon();
 }
 
-string16 WalletInstrumentWrapper::GetDisplayText() {
+bool WalletInstrumentWrapper::GetDisplayText(
+    base::string16* vertically_compact,
+    base::string16* horizontally_compact) {
   // TODO(dbeam): handle other instrument statuses? http://crbug.com/233048
   if (instrument_->status() == wallet::WalletItems::MaskedInstrument::EXPIRED ||
       !instrument_->address().is_complete_address() ||
       GetInfo(PHONE_HOME_WHOLE_NUMBER).empty()) {
-    return string16();
+    return false;
   }
 
+  DataModelWrapper::GetDisplayText(vertically_compact, horizontally_compact);
   // TODO(estade): descriptive_name() is user-provided. Should we use it or
   // just type + last 4 digits?
-  string16 line1 = instrument_->descriptive_name();
-  return line1 + ASCIIToUTF16("\n") + DataModelWrapper::GetDisplayText();
+  base::string16 line1 = instrument_->descriptive_name() + ASCIIToUTF16("\n");
+  *vertically_compact = line1 + *vertically_compact;
+  *horizontally_compact = line1 + *horizontally_compact;
+  return true;
 }
 
 // FullWalletBillingWrapper
@@ -224,7 +255,7 @@ FullWalletBillingWrapper::FullWalletBillingWrapper(
 
 FullWalletBillingWrapper::~FullWalletBillingWrapper() {}
 
-string16 FullWalletBillingWrapper::GetInfo(AutofillFieldType type) const {
+base::string16 FullWalletBillingWrapper::GetInfo(AutofillFieldType type) const {
   if (type == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(full_wallet_->expiration_month());
 
@@ -235,12 +266,15 @@ string16 FullWalletBillingWrapper::GetInfo(AutofillFieldType type) const {
       type, g_browser_process->GetApplicationLocale());
 }
 
-string16 FullWalletBillingWrapper::GetDisplayText() {
+bool FullWalletBillingWrapper::GetDisplayText(
+    base::string16* vertically_compact,
+    base::string16* horizontally_compact) {
   // TODO(dbeam): handle other required actions? http://crbug.com/163508
   if (full_wallet_->HasRequiredAction(wallet::UPDATE_EXPIRATION_DATE))
-    return string16();
+    return false;
 
-  return DataModelWrapper::GetDisplayText();
+  return DataModelWrapper::GetDisplayText(vertically_compact,
+                                          horizontally_compact);
 }
 
 // FullWalletShippingWrapper
@@ -253,7 +287,8 @@ FullWalletShippingWrapper::FullWalletShippingWrapper(
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
-string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) const {
+base::string16 FullWalletShippingWrapper::GetInfo(
+    AutofillFieldType type) const {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }