[rAc] Move email address into billing address section.

chrome/browser/ui/autofill/data_model_wrapper.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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/callback.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
@@ skipping 66 matching lines @@
   if (!address2.empty())
     address += separator + address2;
 
   base::string16 comma = ASCIIToUTF16(", ");
   base::string16 newline = ASCIIToUTF16("\n");
   address += separator +
       GetInfo(AutofillType(ADDRESS_HOME_CITY)) + comma +
       GetInfo(AutofillType(ADDRESS_HOME_STATE)) + ASCIIToUTF16(" ") +
       GetInfo(AutofillType(ADDRESS_HOME_ZIP));
 
-  // TODO(estade): email?
+  base::string16 email = GetInfo(AutofillType(EMAIL_ADDRESS));
+  if (!email.empty())
+    address += newline + email;
   address += newline + GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER));
 
   return address;
 }
 
 // EmptyDataModelWrapper
 
 EmptyDataModelWrapper::EmptyDataModelWrapper() {}
 EmptyDataModelWrapper::~EmptyDataModelWrapper() {}
 
@@ skipping 53 matching lines @@
     field->SetHtmlType(HTML_TYPE_NAME, field->html_mode());
     AutofillDataModelWrapper::FillFormField(field);
 
     // Restore the field's true type.
     field->SetHtmlType(original_type, field->html_mode());
   } else {
     AutofillDataModelWrapper::FillFormField(field);
   }
 }
 
+AutofillShippingAddressWrapper::AutofillShippingAddressWrapper(
+    const AutofillProfile* profile, size_t variant)
+    : AutofillProfileWrapper(profile, variant) {}
+
+AutofillShippingAddressWrapper::~AutofillShippingAddressWrapper() {}
+
+base::string16 AutofillShippingAddressWrapper::GetInfo(
+    const AutofillType& type) const {
+  // Shipping addresses don't have email addresses associated with them.
+  if (type.GetStorableType() == EMAIL_ADDRESS)
+    return base::string16();
+
+  return AutofillProfileWrapper::GetInfo(type);
+}
+
 // AutofillCreditCardWrapper
 
 AutofillCreditCardWrapper::AutofillCreditCardWrapper(const CreditCard* card)
     : AutofillDataModelWrapper(card, 0),
       card_(card) {}
 
 AutofillCreditCardWrapper::~AutofillCreditCardWrapper() {}
 
 base::string16 AutofillCreditCardWrapper::GetInfo(const AutofillType& type)
     const {
@@ skipping 22 matching lines @@
 }
 
 // WalletAddressWrapper
 
 WalletAddressWrapper::WalletAddressWrapper(
     const wallet::Address* address) : address_(address) {}
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
 base::string16 WalletAddressWrapper::GetInfo(const AutofillType& type) const {
+  // Reachable from DataModelWrapper::GetDisplayText().
+  if (type.GetStorableType() == EMAIL_ADDRESS)
+    return base::string16();
+
   return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 bool WalletAddressWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   if (!address_->is_complete_address() ||
       GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)).empty()) {
     return false;
   }
 
   return DataModelWrapper::GetDisplayText(vertically_compact,
                                           horizontally_compact);
 }
 
 // WalletInstrumentWrapper
 
 WalletInstrumentWrapper::WalletInstrumentWrapper(
     const wallet::WalletItems::MaskedInstrument* instrument)
     : instrument_(instrument) {}
 
 WalletInstrumentWrapper::~WalletInstrumentWrapper() {}
 
 base::string16 WalletInstrumentWrapper::GetInfo(const AutofillType& type)
     const {
+  // Reachable from DataModelWrapper::GetDisplayText().
+  if (type.GetStorableType() == EMAIL_ADDRESS)
+    return base::string16();
+
   if (type.GetStorableType() == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(instrument_->expiration_month());
 
   return instrument_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 gfx::Image WalletInstrumentWrapper::GetIcon() {
   return instrument_->CardIcon();
 }
 
@@ skipping 74 matching lines @@
   ServerFieldType storable_type = type.GetStorableType();
   for (DetailOutputMap::const_iterator it = outputs_.begin();
        it != outputs_.end(); ++it) {
     if (storable_type == AutofillType(it->first->type).GetStorableType())
       return it->second;
   }
   return base::string16();
 }
 
 }  // namespace autofill