[rAC] Display Autofill popups vertically compact.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
 #include "base/i18n/timezone.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill-inl.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
 
 namespace autofill {
 namespace {
 
 const base::string16::value_type kCreditCardPrefix[] = {'*', 0};
 
 template<typename T>
 class FormGroupMatchesByGUIDFunctor {
  public:
   explicit FormGroupMatchesByGUIDFunctor(const std::string& guid)
@@ skipping 589 matching lines @@
 
   if (!field_is_autofilled) {
     AutofillProfile::CreateInferredLabels(
         matched_profiles, &other_field_types,
         type.GetStorableType(), 1, labels);
   } else {
     // No sub-labels for previously filled fields.
     labels->resize(values->size());
   }
 
+  // Names need to be in vertically compact form - i.e. a single line. Join
+  // multi-line names into a single line, using a separator.
+  // The separator is locale-specific.
+  base::string16 compact_separator = base::UTF8ToUTF16(
+      ::i18n::addressinput::GetCompactAddressLinesSeparator(app_locale_));
+  for (size_t i = 0; i < values->size(); ++i) {
+    std::vector<base::string16> lines;
+    base::SplitString((*values)[i], '\n', &lines);
+    (*values)[i] = (JoinString(lines, compact_separator));

[Evan Stade, 2014/05/22 18:14:23]

nit: why the extra parens aroudn JoinString?

[groby-ooo-7-16, 2014/05/22 22:54:46]

No idea. Removed.

+  }
+
   // No icons for profile suggestions.
   icons->resize(values->size());
 }
 
 void PersonalDataManager::GetCreditCardSuggestions(
     const AutofillType& type,
     const base::string16& field_contents,
     std::vector<base::string16>* values,
     std::vector<base::string16>* labels,
     std::vector<base::string16>* icons,
@@ skipping 426 matching lines @@
 
   return std::string();
 }
 
 void PersonalDataManager::EnabledPrefChanged() {
   default_country_code_.clear();
   NotifyPersonalDataChanged();
 }
 
 }  // namespace autofill