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

chrome/browser/views/autofill_profiles_view_win.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/views/autofill_profiles_view_win.h"
 
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "app/l10n_util.h"
@@ skipping 240 matching lines @@
                                       !child_dialog_opened_ &&
                                       autofill_enabled);
 
   int selected_row_count = scroll_view_->SelectedRowCount();
   edit_button_->SetEnabled(selected_row_count == 1 && !child_dialog_opened_ &&
                            autofill_enabled);
   remove_button_->SetEnabled(selected_row_count > 0 && !child_dialog_opened_ &&
                              autofill_enabled);
 }
 
-void AutoFillProfilesView::UpdateProfileLabels() {
-  std::vector<AutoFillProfile*> profiles;
-  profiles.resize(profiles_set_.size());
-  for (size_t i = 0; i < profiles_set_.size(); ++i) {
-    profiles[i] = &(profiles_set_[i].address);
-  }
-  AutoFillProfile::AdjustInferredLabels(&profiles);
-}
-
 void AutoFillProfilesView::ChildWindowOpened() {
   child_dialog_opened_ = true;
   UpdateWidgetState();
 }
 
 void AutoFillProfilesView::ChildWindowClosed() {
   child_dialog_opened_ = false;
   UpdateWidgetState();
 }
 
@@ skipping 159 matching lines @@
 }
 
 void AutoFillProfilesView::OnPersonalDataChanged() {
   profiles_set_.clear();
   for (std::vector<AutoFillProfile*>::const_iterator address_it =
            personal_data_manager_->profiles().begin();
        address_it != personal_data_manager_->profiles().end();
        ++address_it) {
     profiles_set_.push_back(EditableSetInfo(*address_it));
   }
-  UpdateProfileLabels();
 
   credit_card_set_.clear();
   for (std::vector<CreditCard*>::const_iterator cc_it =
            personal_data_manager_->credit_cards().begin();
        cc_it != personal_data_manager_->credit_cards().end();
        ++cc_it) {
     credit_card_set_.push_back(EditableSetInfo(*cc_it));
   }
 
   if (table_model_.get())
@@ skipping 96 matching lines @@
                                !credit_card_set_.empty();
   if (!imported_data_present) {
     profiles_set_.reserve(personal_data_manager_->profiles().size());
     for (std::vector<AutoFillProfile*>::const_iterator address_it =
          personal_data_manager_->profiles().begin();
          address_it != personal_data_manager_->profiles().end();
          ++address_it) {
       profiles_set_.push_back(EditableSetInfo(*address_it));
     }
   }
-  UpdateProfileLabels();
 
   if (!imported_data_present) {
     credit_card_set_.reserve(personal_data_manager_->credit_cards().size());
     for (std::vector<CreditCard*>::const_iterator cc_it =
          personal_data_manager_->credit_cards().begin();
          cc_it != personal_data_manager_->credit_cards().end();
          ++cc_it) {
       credit_card_set_.push_back(EditableSetInfo(*cc_it));
     }
   }
@@ skipping 729 matching lines @@
 }
 
 int AutoFillProfilesView::ContentListTableModel::RowCount() {
   return profiles_->size() + credit_cards_->size();
 }
 
 std::wstring AutoFillProfilesView::ContentListTableModel::GetText(
     int row, int column_id) {
   DCHECK(row < static_cast<int>(profiles_->size() + credit_cards_->size()));
   if (row < static_cast<int>(profiles_->size())) {
-    return profiles_->at(row).address.PreviewSummary();
+    return profiles_->at(row).address.Label();
   } else {
     row -= profiles_->size();
     return credit_cards_->at(row).credit_card.PreviewSummary();
   }
 }
 
 TableModel::Groups AutoFillProfilesView::ContentListTableModel::GetGroups() {
   TableModel::Groups groups;
 
   TableModel::Group profile_group;
@@ skipping 26 matching lines @@
                         AutoFillDialogObserver* observer,
                         Profile* profile) {
   DCHECK(profile);
 
   PersonalDataManager* personal_data_manager =
       profile->GetPersonalDataManager();
   DCHECK(personal_data_manager);
   AutoFillProfilesView::Show(parent, observer, personal_data_manager, profile,
                              profile->GetPrefs(), NULL, NULL);
 }