[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 534 matching lines @@
   const std::vector<AutofillProfile*>& profiles = GetProfiles();
   std::vector<AutofillProfile*> matched_profiles;
   for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
        iter != profiles.end(); ++iter) {
     AutofillProfile* profile = *iter;
 
     // The value of the stored data for this field type in the |profile|.
     std::vector<base::string16> multi_values;
     profile->GetMultiInfo(type, app_locale_, &multi_values);
 
+    // Names need to be in vertically compact form - i.e. a single line. Join
+    // multi-line names into a single line, using a separator.

[Ilya Sherman, 2014/05/23 10:05:05]

nit: "names" -> "addresses"?

[groby-ooo-7-16, 2014/07/10 02:59:14]

Done.

+    // The separator is locale-specific.
+    base::string16 compact_separator = base::UTF8ToUTF16(
+        ::i18n::addressinput::GetCompactAddressLinesSeparator(app_locale_));

[Evan Stade, 2014/05/22 23:41:28]

not |app_locale_|. profile->language_code().

[groby-ooo-7-16, 2014/07/10 02:59:14]

Done.

+
     for (size_t i = 0; i < multi_values.size(); ++i) {
+      // Create vertically compact form.
+      std::vector<base::string16> lines;
+      base::SplitString((*values)[i], '\n', &lines);
+      (*values)[i] = JoinString(lines, compact_separator);
+
       if (!field_is_autofilled) {
         // Suggest data that starts with what the user has typed.
         if (!multi_values[i].empty() &&
             StartsWith(multi_values[i], field_contents, false) &&
             (filter.is_null() || filter.Run(*profile))) {
           matched_profiles.push_back(profile);
           values->push_back(multi_values[i]);
           guid_pairs->push_back(GUIDPair(profile->guid(), i));
         }
       } else {
@@ skipping 480 matching lines @@
 
   return std::string();
 }
 
 void PersonalDataManager::EnabledPrefChanged() {
   default_country_code_.clear();
   NotifyPersonalDataChanged();
 }
 
 }  // namespace autofill