Add billing address as a mandatory field of Payments credit cards.

components/autofill/core/browser/address_combobox_model.cc

+// Copyright 2017 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/address_combobox_model.h"
+
+#include "base/memory/ptr_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/strings/grit/components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/models/combobox_model_observer.h"
+#include "ui/gfx/text_elider.h"
+
+namespace autofill {
+
+namespace {
+int kIndexOffset = 2;
+}  // namespace
+
+AddressComboboxModel::AddressComboboxModel(
+    const PersonalDataManager& personal_data_manager,
+    const std::string& app_locale)
+    : app_locale_(app_locale) {
+  for (const auto* profile : personal_data_manager.GetProfilesToSuggest()) {
+    profiles_cache_.push_back(base::MakeUnique<AutofillProfile>(*profile));
+  }
+  UpdateAddresses();
+}
+
+AddressComboboxModel::~AddressComboboxModel() {}
+
+int AddressComboboxModel::GetItemCount() const {
+  // When there are not addresses, a special entry is shown to prompt the user
+  // to add addresses.
+  if (addresses_.size() == 0)
+    return 1;
+  // Add extra items for the "Select" entry and a separator.

[sebsg, 2017/05/02 22:58:55]

Do we also have the add address button if some addresses are present?

[MAD, 2017/05/03 16:15:19]

I'm not sure I understand. You mean the credit card controller may not need an
add address button if the combobox is not empty?
I personally think there should always be an option to add a new address whether
there are existing addresses or not.

[sebsg, 2017/05/03 19:19:29]

Confusion! :) Yes I also think the option to add an address should always be
present. What confuses me is that you add 2 to the count (1 for the "Select" and
1 for the separator) but shouldn't it be 3, to also include the "Add Address"
option?

[MAD, 2017/05/03 23:50:47]

Ha! You were talking about the Add Address entry which is only there when there
are no addresses, as opposed to the Add Address "button" which is aways there.
The idea is that, if there are available addresses, the user can select from
them and not need to add new one (but still can), but if there are no addresses
at all, the user doesn't have the choice but to add a new one, and in that case,
it wouldn't make sense to show the "Select" entry, nor the separator, since
there are no addresses to show and select.

Makes more sense?

[sebsg, 2017/05/04 16:50:54]

Ahh I didn't realize the "Add address" was a button, on Android it is in the
combobox. Makes sense then.

+  return addresses_.size() + kIndexOffset;
+}
+
+base::string16 AddressComboboxModel::GetItemAt(int index) {
+  DCHECK_GE(index, 0);
+  // A special entry is always added at index 0 and a separator at index 1.
+  DCHECK_LT(static_cast<size_t>(index), addresses_.size() + kIndexOffset);
+
+  // Special entry when no profiles have been created yet.
+  if (addresses_.empty())
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_ADD_BILLING_ADDRESS);
+
+  // Always show the "Select" entry at the top, default selection position.
+  if (index == 0)
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_SELECT);
+
+  // Always show the "Select" entry at the top, default selection position.
+  if (index == 1)
+    return base::ASCIIToUTF16("---");
+
+  return addresses_[index - kIndexOffset].second;
+}
+
+bool AddressComboboxModel::IsItemSeparatorAt(int index) {
+  // The only separator is between the "Select" entry at 0 and the first address
+  // at index 2. So there must be at least one address for a separator to be
+  // shown.
+  DCHECK(index <= kIndexOffset || !addresses_.empty());
+  return index == 1;
+}
+
+void AddressComboboxModel::AddObserver(ui::ComboboxModelObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void AddressComboboxModel::RemoveObserver(ui::ComboboxModelObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+int AddressComboboxModel::AddNewProfile(const AutofillProfile& profile) {
+  profiles_cache_.push_back(base::MakeUnique<AutofillProfile>(profile));

[sebsg, 2017/05/02 22:58:55]

One thing we did on Android is put the new address at the top of the list. That
way if the user clicks on the combobox again, the new address will be right
there at the top. 

Since the number of addresses is generally pretty low, it's not to expensive to
move all the other ones up.

What do you think?

[MAD, 2017/05/03 16:15:19]

OK, do you also put the selected one at the top even if it's not a newly created
one?

[sebsg, 2017/05/03 19:19:29]

No, we put in in all caps, which we may or may not want to do here. The new
address is at the top only because it was just added. If you were to go back to
the main screen and then back again to the card editor, that billing address
doesn't have to be on top (Profiles ordered by frecency).

[MAD, 2017/05/03 23:50:47]

What do we put all in caps? 

The usual behavior in desktop app, is to keep the new entry at the same place
but when the user click on the combobox, the selected item is highlighted, but I
now see that the Chrome UI doesn't do this anymore... :-(

It would not be expensive to reorder the items, but would make things a bit more
complex to manage with the "Select" and separator headers. I would rather leave
it as is if you don't mind.

[sebsg, 2017/05/04 16:50:54]

I think it's good as it is and we can ask Bruno for his UI expert opinion :)

+  UpdateAddresses();
+  DCHECK_GT(addresses_.size(), 0UL);
+  return addresses_.size() + kIndexOffset - 1;
+}
+
+std::string AddressComboboxModel::GetItemIdentifierAt(int index) {
+  // The first two indices are special entries, with no addresses.
+  if (index < kIndexOffset)
+    return std::string();
+  DCHECK_LT(index, addresses_.size() + kIndexOffset);
+  return addresses_[index - kIndexOffset].first;
+}
+
+int AddressComboboxModel::GetIndexOfIdentifier(const std::string& identifier) {
+  for (size_t i = 0; i < addresses_.size(); ++i) {
+    if (addresses_[i].first == identifier)
+      return i + kIndexOffset;
+  }
+  return -1;
+}
+
+void AddressComboboxModel::UpdateAddresses() {
+  addresses_.clear();
+  std::vector<base::string16> labels;
+  // CreateDifferentiatingLabels is expecting a pointer vector and we keep
+  // profiles as unique_ptr.
+  std::vector<AutofillProfile*> profiles;
+  for (const auto& profile : profiles_cache_) {
+    profiles.push_back(profile.get());
+  }
+  AutofillProfile::CreateDifferentiatingLabels(profiles, app_locale_, &labels);
+  DCHECK_EQ(labels.size(), profiles_cache_.size());
+
+  for (size_t i = 0; i < profiles_cache_.size(); ++i) {
+    // Skip showing auxiliary profiles (e.g. Mac Contacts).
+    if (profiles_cache_[i]->record_type() == AutofillProfile::AUXILIARY_PROFILE)
+      continue;
+
+    base::string16 label(labels[i]);
+    if (label.size() > 20) {
+      // gfx::StringSlicer keeps a references to the string16.
+      base::string16 ellipsis(base::ASCIIToUTF16("..."));
+      gfx::StringSlicer slicer(label,
+                               /*ellipsis=*/ellipsis,
+                               /*elide_in_middle=*/false,
+                               /*elide_at_beginning=*/false);
+      label = slicer.CutString(20, /*insert_ellipsis=*/true);
+    }
+    addresses_.push_back(std::make_pair(profiles_cache_[i]->guid(), label));
+  }
+
+  for (auto& observer : observers_) {
+    observer.OnComboboxModelChanged(this);
+  }
+}
+}  // namespace autofill