Never allow empty preview entries. As some data is always present (we drop co...

chrome/browser/autofill/autofill_profile.cc

 // Copyright (c) 2010 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/autofill/autofill_profile.h"
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
@@ skipping 157 matching lines @@
     profile->personal_info_[iter->first] = iter->second->Clone();
   }
 
   return profile;
 }
 
 const string16& AutoFillProfile::Label() const {
   return label_;
 }
 
-string16 AutoFillProfile::PreviewSummary() const {
-  // Fetch the components of the summary string.  Any or all of these
-  // may be an empty string.
-  string16 first_name = GetFieldText(AutoFillType(NAME_FIRST));
-  string16 last_name = GetFieldText(AutoFillType(NAME_LAST));
-  string16 address = GetFieldText(AutoFillType(ADDRESS_HOME_LINE1));
-
-  // String separators depend (below) on the existence of the various fields.
-  bool have_first_name = first_name.length() > 0;
-  bool have_last_name = last_name.length() > 0;
-  bool have_address = address.length() > 0;
-
-  // Name separator defaults to "". Space if we have first and last name.
-  string16 name_separator;
-
-  if (have_first_name && have_last_name) {
-    name_separator = l10n_util::GetStringUTF16(
-        IDS_AUTOFILL_DIALOG_ADDRESS_NAME_SEPARATOR);
-  }
-
-  // E.g. "John Smith", or "John", or "Smith", or "".
-  string16 name_format = l10n_util::GetStringFUTF16(
-      IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_NAME_FORMAT,
-      first_name,
-      name_separator,
-      last_name);
-
-  // Summary separator defaults to "".  ", " if we have name and address.
-  string16 summary_separator;
-  if ((have_first_name || have_last_name) && have_address) {
-    summary_separator = l10n_util::GetStringUTF16(
-        IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_SEPARATOR);
-  }
-
-  // E.g. "John Smith, 123 Main Street".
-  string16 summary_format = l10n_util::GetStringFUTF16(
-      IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_FORMAT,
-      name_format,
-      summary_separator,
-      address);
-
-  return summary_format;
-}
-
 // static
 bool AutoFillProfile::AdjustInferredLabels(
     std::vector<AutoFillProfile*>* profiles) {
   std::vector<string16> created_labels;
   const size_t kMinimalFieldsShown = 2;
   CreateInferredLabels(profiles, &created_labels, kMinimalFieldsShown,
                        UNKNOWN_TYPE);
   DCHECK(profiles->size() == created_labels.size());
   bool updated_labels = false;
   for (size_t i = 0; i < profiles->size(); ++i) {
@@ skipping 302 matching lines @@
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(
              PHONE_HOME_WHOLE_NUMBER)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(
              PHONE_FAX_WHOLE_NUMBER)));
 }