[Payments] Fix up field widths in desktop editors.

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 {
 // There's one header entry to prompt the user to select an address, and a
 // separator.
 int kNbHeaderEntries = 2;
 }  // namespace
 
 AddressComboboxModel::AddressComboboxModel(
     const PersonalDataManager& personal_data_manager,
-    const std::string& app_locale)
-    : app_locale_(app_locale) {
+    const std::string& app_locale,
+    const std::string& default_selected_guid)
+    : app_locale_(app_locale), default_selected_guid_(default_selected_guid) {
   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
@@ skipping 27 matching lines @@
 }
 
 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 <= kNbHeaderEntries || !addresses_.empty());
   return index == 1;
 }
 
+int AddressComboboxModel::GetDefaultIndex() const {
+  if (!default_selected_guid_.empty()) {
+    int address_index = GetIndexOfIdentifier(default_selected_guid_);
+    if (address_index != -1)
+      return address_index;
+  }
+  return ui::ComboboxModel::GetDefaultIndex();
+}
+
 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));
   UpdateAddresses();
   DCHECK_GT(addresses_.size(), 0UL);
   return addresses_.size() + kNbHeaderEntries - 1;
 }
 
 std::string AddressComboboxModel::GetItemIdentifierAt(int index) {
   // The first two indices are special entries, with no addresses.
   if (index < kNbHeaderEntries)
     return std::string();
   DCHECK_LT(static_cast<size_t>(index), addresses_.size() + kNbHeaderEntries);
   return addresses_[index - kNbHeaderEntries].first;
 }
 
-int AddressComboboxModel::GetIndexOfIdentifier(const std::string& identifier) {
+int AddressComboboxModel::GetIndexOfIdentifier(
+    const std::string& identifier) const {
   for (size_t i = 0; i < addresses_.size(); ++i) {
     if (addresses_[i].first == identifier)
       return i + kNbHeaderEntries;
   }
   return -1;
 }
 
 void AddressComboboxModel::UpdateAddresses() {
   addresses_.clear();
   std::vector<base::string16> labels;
@@ skipping 12 matching lines @@
       continue;
 
     addresses_.push_back(std::make_pair(profiles_cache_[i]->guid(), labels[i]));
   }
 
   for (auto& observer : observers_) {
     observer.OnComboboxModelChanged(this);
   }
 }
 }  // namespace autofill